upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '4381-assert-in-dns__catz_update_cb-on-shutdown-9.18' into 'bind-9.18'

Browse source 
[9.18] Resolve "Assertion failure in dns__catz_update_cb() on shutdown"

See merge request isc-projects/bind9!8413
This commit is contained in:
Arаm Sаrgsyаn 2023-10-23 11:08:16 +00:00
commit d18be57900
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -1,3 +1,5 @@
6271. [bug] Fix a shutdown race in dns__catz_update_cb(). [GL #4381]
6267. [func] Adjust UDP timeouts used in zone maintenance. [GL #4260]
6265. [bug] Don't schedule resign operations on the raw version

16
lib/dns/catz.c
View file

@ -881,6 +881,13 @@ dns_catz_add_zone(dns_catz_zones_t *catzs, const dns_name_t *name,
LOCK(&catzs->lock);
/*
* This function is called only during a (re)configuration, while
* 'catzs->zones' can become NULL only during shutdown.
*/
INSIST(catzs->zones != NULL);
INSIST(!atomic_load(&catzs->shuttingdown));
result = dns_catz_new_zone(catzs, &catz, name);
if (result != ISC_R_SUCCESS) {
goto cleanup;
@ -919,6 +926,10 @@ dns_catz_get_zone(dns_catz_zones_t *catzs, const dns_name_t *name) {
REQUIRE(ISC_MAGIC_VALID(name, DNS_NAME_MAGIC));
LOCK(&catzs->lock);
if (catzs->zones == NULL) {
UNLOCK(&catzs->lock);
return (NULL);
}
result = isc_ht_find(catzs->zones, name->ndata, name->length,
(void **)&found);
UNLOCK(&catzs->lock);
@ -2299,6 +2310,11 @@ dns__catz_update_cb(void *data) {
*/
dns_name_toregion(&updb->origin, &r);
LOCK(&catzs->lock);
if (catzs->zones == NULL) {
UNLOCK(&catzs->lock);
result = ISC_R_SHUTTINGDOWN;
goto exit;
}
result = isc_ht_find(catzs->zones, r.base, r.length, (void **)&oldcatz);
is_active = (result == ISC_R_SUCCESS && oldcatz->active);
UNLOCK(&catzs->lock);

3
lib/dns/include/dns/catz.h
View file

@ -311,7 +311,8 @@ isc_result_t
dns_catz_add_zone(dns_catz_zones_t *catzs, const dns_name_t *name,
dns_catz_zone_t **catzp);
/*%<
* Allocate a new catz named 'name' and put it in 'catzs' collection.
* Allocate a new catz named 'name' and put it in 'catzs' collection. This
* function is safe to call only during a (re)configuration.
*
* Requires:
* \li 'catzs' is a valid dns_catz_zones_t.