From: Evan Hunt <each@isc.org>
Date: Fri, 28 Jul 2017 07:02:17 +0000 (-0700)
Subject: [master] race condition when reloading while resigning
X-Git-Tag: v9.12.0a1~168
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=036305f00de671ea8f03056e642136a82436c4ae;p=thirdparty%2Fbind9.git

[master] race condition when reloading while resigning

4661.	[bug]		A race condition could occur if a zone was reloaded
			while resigning, triggering a crash in
			rbtdb.c:closeversion(). [RT #45276]
---

diff --git a/CHANGES b/CHANGES
index 767d06203c5..992eb1c90a8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4661.	[bug]		A race condition could occur if a zone was reloaded
+			while resigning, triggering a crash in
+			rbtdb.c:closeversion(). [RT #45276]
+
 4660.	[bug]		Remove spurious "peer" from Windows socket log
 			messages. [RT #45617]
 
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index ab2b89e1503..247b77641d2 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -6438,7 +6438,7 @@ zone_resigninc(dns_zone_t *zone) {
 	for (i = 0; i < nkeys; i++)
 		dst_key_free(&zone_keys[i]);
 	if (version != NULL) {
-		dns_db_closeversion(zone->db, &version, ISC_FALSE);
+		dns_db_closeversion(db, &version, ISC_FALSE);
 		dns_db_detach(&db);
 	} else if (db != NULL)
 		dns_db_detach(&db);