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

Prepare a zone for shutting down when deleting it from a view

Browse Source 
After b171cacf4f0123ba96bef6eedfc92dfb608db6b7, a zone object can
remain in the memory for a while, until garbage collection is run.
Setting the DNS_ZONEFLG_EXITING flag should prevent the zone
maintenance function from running while it's in that state.
Otherwise, a secondary zone could initiate a zone transfer after
it had been deleted.

(cherry picked from commit 874ca5ca2f1f381e434304e262ea08e77e3bdf65)
This commit is contained in:
Aram Sargsyan 2025-05-12 13:58:38 +00:00 committed by Ondřej Surý
parent f09bb8b88c
commit 80a43c9241
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/dns/include/dns/zone.h
View File

@ -1757,6 +1757,20 @@ dns_zone_findkeys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
*\li Error
*/
void
dns_zone_prepare_shutdown(dns_zone_t *zone);
/*%<
* Prepare a zone for shutdown by setting the DNS_ZONEFLG_EXITING flag even
* before the final reference is detached. Useful, because the zone object can
* be kept around with a valid reference from the zonetable until qp garbage
* collector runs, and we don't want, for example, zone maintenance to happen
* while waiting for it. Note that the zone can not be used normally again after
* this function is called.
*
* Requires:
*\li 'zone' to be a valid initialised zone.
*/
void
dns_zonemgr_create(isc_mem_t *mctx, isc_nm_t *netmgr, dns_zonemgr_t **zmgrp);
/*%<

2
lib/dns/view.c
View File

@ -785,6 +785,8 @@ dns_view_delzone(dns_view_t *view, dns_zone_t *zone) {
REQUIRE(DNS_VIEW_VALID(view));
dns_zone_prepare_shutdown(zone);
rcu_read_lock();
zonetable = rcu_dereference(view->zonetable);
if (zonetable != NULL) {

9
lib/dns/zone.c
View File

@ -6401,6 +6401,15 @@ failure:
return result;
}
void
dns_zone_prepare_shutdown(dns_zone_t *zone) {
REQUIRE(DNS_ZONE_VALID(zone));
LOCK_ZONE(zone);
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_EXITING);
UNLOCK_ZONE(zone);
}
/*%
* Find DNSSEC keys used for signing zone with dnssec-policy. Load these keys
* into 'keys'. Requires KASP to be locked.