upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-22 15:50:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix RPZ locking issues on error conditions

Browse source
This commit is contained in:
Ralph Dolmans 2020-01-30 14:46:39 +01:00
parent 833c4b1300
commit b9c9fc066f
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
respip/respip.c
View file

@ -957,6 +957,7 @@ respip_rewrite_reply(const struct query_info* qinfo,
region, &rpz_used)) { region, &rpz_used)) {
log_err("out of memory"); log_err("out of memory");
lock_rw_unlock(&raddr->lock); lock_rw_unlock(&raddr->lock);
lock_rw_unlock(&az->rpz_lock);
return 0; return 0;
} }
if(!rpz_used) { if(!rpz_used) {
@ -1099,7 +1100,6 @@ respip_operate(struct module_qstate* qstate, enum module_ev event, int id,
if (actinfo.action == respip_always_deny || if (actinfo.action == respip_always_deny ||
(new_rep == qstate->return_msg->rep && (new_rep == qstate->return_msg->rep &&
(actinfo.action == respip_deny || (actinfo.action == respip_deny ||
actinfo.action == respip_deny ||
actinfo.action == respip_inform_deny))) { actinfo.action == respip_inform_deny))) {
/* for deny-variant actions (unless response-ip /* for deny-variant actions (unless response-ip
* data is applied), mark the query state so * data is applied), mark the query state so

6
services/rpz.c
View file

@ -681,11 +681,17 @@ rpz_find_zone(struct rpz* r, uint8_t* qname, size_t qname_len, uint16_t qclass,
ce = dname_get_shared_topdomain(z->name, qname); ce = dname_get_shared_topdomain(z->name, qname);
if(!ce /* should not happen */ || !*ce /* root */) { if(!ce /* should not happen */ || !*ce /* root */) {
lock_rw_unlock(&z->lock); lock_rw_unlock(&z->lock);
if(zones_keep_lock) {
lock_rw_unlock(&r->local_zones->lock);
}
return NULL; return NULL;
} }
ce_labs = dname_count_size_labels(ce, &ce_len); ce_labs = dname_count_size_labels(ce, &ce_len);
if(ce_len+2 > sizeof(wc)) { if(ce_len+2 > sizeof(wc)) {
lock_rw_unlock(&z->lock); lock_rw_unlock(&z->lock);
if(zones_keep_lock) {
lock_rw_unlock(&r->local_zones->lock);
}
return NULL; return NULL;
} }
wc[0] = 1; /* length of wildcard label */ wc[0] = 1; /* length of wildcard label */