mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

Merge branch '973-pause-dbiterator-in-rpz' into 'master'

Browse Source 
Fix deadlock in RPZ update code.

Closes #973

See merge request isc-projects/bind9!1770
This commit is contained in:
Evan Hunt
2019-04-06 15:23:37 -04:00
parent b22a5b6fac 06021b3529
commit 27d788cff3
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
5201. [bug] Fix a possible deadlock in RPZ update code. [GL #973]
5200. [placeholder] 5200. [placeholder]
5199. [placeholder] 5199. [placeholder]

10
lib/dns/rpz.c
View File

@@ -1732,6 +1732,16 @@ setup_update(dns_rpz_zone_t *rpz) {
goto cleanup; goto cleanup;
} }
result = dns_dbiterator_pause(rpz->updbit);
if (result != ISC_R_SUCCESS) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
DNS_LOGMODULE_MASTER, ISC_LOG_ERROR,
"rpz: %s: failed to pause db iterator - %s",
domain, isc_result_totext(result));
goto cleanup;
}
cleanup: cleanup:
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
if (rpz->updbit != NULL) if (rpz->updbit != NULL)