mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

4151. [bug] 'rndc flush' could cause a deadlock. [RT #39835]

Browse Source
This commit is contained in:
Mark Andrews
2015-07-03 10:17:33 +10:00
parent 2bd63eca27
commit 307adf6792
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
4151. [bug] 'rndc flush' could cause a deadlock. [RT #39835]
4150. [bug] win32: listen-on-v6 { any; }; was not working. Apply 4150. [bug] win32: listen-on-v6 { any; }; was not working. Apply
minimal fix. [RT #39667] minimal fix. [RT #39667]

24
lib/dns/cache.c
View File

@@ -1141,31 +1141,43 @@ cleaner_shutdown_action(isc_task_t *task, isc_event_t *event) {
isc_result_t isc_result_t
dns_cache_flush(dns_cache_t *cache) { dns_cache_flush(dns_cache_t *cache) {
dns_db_t *db = NULL; dns_db_t *db = NULL, *olddb;
dns_dbiterator_t *dbiterator = NULL, *olddbiterator = NULL;
isc_result_t result; isc_result_t result;
result = cache_create_db(cache, &db); result = cache_create_db(cache, &db);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
return (result); return (result);
result = dns_db_createiterator(db, ISC_FALSE, &dbiterator);
if (result != ISC_R_SUCCESS) {
dns_db_detach(&db);
return (result);
}
LOCK(&cache->lock); LOCK(&cache->lock);
LOCK(&cache->cleaner.lock); LOCK(&cache->cleaner.lock);
if (cache->cleaner.state == cleaner_s_idle) { if (cache->cleaner.state == cleaner_s_idle) {
if (cache->cleaner.iterator != NULL) olddbiterator = cache->cleaner.iterator;
dns_dbiterator_destroy(&cache->cleaner.iterator); cache->cleaner.iterator = dbiterator;
(void) dns_db_createiterator(db, ISC_FALSE, dbiterator = NULL;
&cache->cleaner.iterator);
} else { } else {
if (cache->cleaner.state == cleaner_s_busy) if (cache->cleaner.state == cleaner_s_busy)
cache->cleaner.state = cleaner_s_done; cache->cleaner.state = cleaner_s_done;
cache->cleaner.replaceiterator = ISC_TRUE; cache->cleaner.replaceiterator = ISC_TRUE;
} }
dns_db_detach(&cache->db); olddb = cache->db;
cache->db = db; cache->db = db;
dns_db_setcachestats(cache->db, cache->stats); dns_db_setcachestats(cache->db, cache->stats);
UNLOCK(&cache->cleaner.lock); UNLOCK(&cache->cleaner.lock);
UNLOCK(&cache->lock); UNLOCK(&cache->lock);
if (dbiterator != NULL)
dns_dbiterator_destroy(&dbiterator);
if (olddbiterator != NULL)
dns_dbiterator_destroy(&olddbiterator);
dns_db_detach(&olddb);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }