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

Fix a data race between the dns_zone and dns_catz modules

Browse Source 
The dns_zone_catz_enable_db() and dns_zone_catz_disable_db()
functions can race with similar operations in the catz module
because there is no synchronization between the threads.

Add catz functions which use the view's catalog zones' lock
when registering/unregistering the database update notify callback,
and use those functions in the dns_zone module, instead of doing it
directly.
This commit is contained in:
Aram Sargsyan 2023-06-09 07:13:27 +00:00
parent 68cfbd2bd1
commit 6f1f5fc307
3 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/dns/catz.c
View File

@ -2191,6 +2191,26 @@ cleanup:
return (result);
}
void
dns_catz_dbupdate_unregister(dns_db_t *db, dns_catz_zones_t *catzs) {
REQUIRE(DNS_DB_VALID(db));
REQUIRE(DNS_CATZ_ZONES_VALID(catzs));
LOCK(&catzs->lock);
dns_db_updatenotify_unregister(db, dns_catz_dbupdate_callback, catzs);
UNLOCK(&catzs->lock);
}
void
dns_catz_dbupdate_register(dns_db_t *db, dns_catz_zones_t *catzs) {
REQUIRE(DNS_DB_VALID(db));
REQUIRE(DNS_CATZ_ZONES_VALID(catzs));
LOCK(&catzs->lock);
dns_db_updatenotify_register(db, dns_catz_dbupdate_callback, catzs);
UNLOCK(&catzs->lock);
}
static bool
catz_rdatatype_is_processable(const dns_rdatatype_t type) {
return (!dns_rdatatype_isdnssec(type) && type != dns_rdatatype_cds &&

20
lib/dns/include/dns/catz.h
View File

@ -354,6 +354,26 @@ dns_catz_dbupdate_callback(dns_db_t *db, void *fn_arg);
* \li 'fn_arg' is not NULL (casted to dns_catz_zones_t*).
*/
void
dns_catz_dbupdate_unregister(dns_db_t *db, dns_catz_zones_t *catzs);
/*%<
* Register the catalog zone database update notify callback.
*
* Requires:
* \li 'db' is a valid database.
* \li 'catzs' is valid.
*/
void
dns_catz_dbupdate_register(dns_db_t *db, dns_catz_zones_t *catzs);
/*%<
* Unregister the catalog zone database update notify callback.
*
* Requires:
* \li 'db' is a valid database.
* \li 'catzs' is valid.
*/
void
dns_catz_prereconfig(dns_catz_zones_t *catzs);
/*%<

6
lib/dns/zone.c
View File

@ -1939,8 +1939,7 @@ dns_zone_catz_enable_db(dns_zone_t *zone, dns_db_t *db) {
REQUIRE(db != NULL);
if (zone->catzs != NULL) {
dns_db_updatenotify_register(db, dns_catz_dbupdate_callback,
zone->catzs);
dns_catz_dbupdate_register(db, zone->catzs);
}
}
@ -1950,8 +1949,7 @@ dns_zone_catz_disable_db(dns_zone_t *zone, dns_db_t *db) {
REQUIRE(db != NULL);
if (zone->catzs != NULL) {
dns_db_updatenotify_unregister(db, dns_catz_dbupdate_callback,
zone->catzs);
dns_catz_dbupdate_unregister(db, zone->catzs);
}
}