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

4107. [bug] Address potential deadlock when updating zone content.

Browse Source 
[RT #39269]
This commit is contained in:
Mark Andrews
2015-04-18 13:45:03 +10:00
parent 1413616670
commit ef0e674456
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
4107. [bug] Address potential deadlock when updating zone content.
[RT #39269]
4106. [port] Improve readline support. [RT #38938] 4106. [port] Improve readline support. [RT #38938]
4105. [port] Misc fixes for Microsoft Visual Studio 4105. [port] Misc fixes for Microsoft Visual Studio

14
lib/dns/rbtdb.c
View File

@@ -2428,6 +2428,7 @@ setnsec3parameters(dns_db_t *db, rbtdb_version_t *version) {
unsigned int count, length; unsigned int count, length;
dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db; dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)db;
RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
version->havensec3 = ISC_FALSE; version->havensec3 = ISC_FALSE;
node = rbtdb->origin_node; node = rbtdb->origin_node;
NODE_LOCK(&(rbtdb->node_locks[node->locknum].lock), NODE_LOCK(&(rbtdb->node_locks[node->locknum].lock),
@@ -2504,6 +2505,7 @@ setnsec3parameters(dns_db_t *db, rbtdb_version_t *version) {
unlock: unlock:
NODE_UNLOCK(&(rbtdb->node_locks[node->locknum].lock), NODE_UNLOCK(&(rbtdb->node_locks[node->locknum].lock),
isc_rwlocktype_read); isc_rwlocktype_read);
RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_read);
} }
static void static void
@@ -2565,6 +2567,13 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
goto end; goto end;
} }
/*
* Update the zone's secure status in version before making
* it the current version.
*/
if (version->writer && commit && !IS_CACHE(rbtdb))
iszonesecure(db, version, rbtdb->origin_node);
RBTDB_LOCK(&rbtdb->lock, isc_rwlocktype_write); RBTDB_LOCK(&rbtdb->lock, isc_rwlocktype_write);
serial = version->serial; serial = version->serial;
if (version->writer) { if (version->writer) {
@@ -2622,11 +2631,6 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
cleanup_version->changed_list, cleanup_version->changed_list,
link); link);
} }
/*
* Update the zone's secure status.
*/
if (!IS_CACHE(rbtdb))
iszonesecure(db, version, rbtdb->origin_node);
/* /*
* Become the current version. * Become the current version.
*/ */