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 deadlock issue with key-directory and in-view

Browse Source 
When locking key files for a zone, we iterate over all the views and
lock a mutex inside the zone structure. However, if we envounter an
in-view zone, we will try to lock the key files twice, one time for
the home view and one time for the in-view view. This will lead to
a deadlock because one thread is trying to get the same lock twice.
This commit is contained in:
Matthijs Mekking 2021-06-21 11:36:50 +02:00
parent acd83881ff
commit 42c601ae14
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/dns/zone.c
View File

@ -6395,6 +6395,17 @@ dns__zone_lockunlock_keyfiles(dns_zone_t *zone, bool lock) {
if (ret == ISC_R_SUCCESS) {
INSIST(DNS_ZONE_VALID(z));
/*
* Skip in-view zones, in other words if the view
* pointer is not the same as the zone view pointer:
* 'in-view' zones can be part of another view,
* while they also have their own home view.
*/
if (v != z->view) {
dns_zone_detach(&z);
continue;
}
/* WMM check if policy is the same? */
if (lock) {
LOCK_KEYFILES(z);