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

Merge branch '1423-threadsanitizer-data-race-time-c-170-in-isc_time_nowplusinterval' into 'master'

Browse Source 
Ensure all zone_settimer() calls are done on locked zone

Closes #1423

See merge request isc-projects/bind9!2738
This commit is contained in:
Ondřej Surý
2019-12-12 06:15:20 +00:00
parent 8536d740f1 cf48e8eb32
commit 80c476721c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/dns/zone.c
View File

@@ -10830,7 +10830,9 @@ zone_maintenance(dns_zone_t *zone) {
default: default:
break; break;
} }
LOCK_ZONE(zone);
zone_settimer(zone, &now); zone_settimer(zone, &now);
UNLOCK_ZONE(zone);
} }
void void
@@ -13659,6 +13661,7 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) {
isc_result_t result; isc_result_t result;
REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(DNS_ZONE_VALID(zone));
REQUIRE(LOCKED_ZONE(zone));
ENTER; ENTER;
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_EXITING)) if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_EXITING))
@@ -19038,6 +19041,7 @@ zone_rekey(dns_zone_t *zone) {
UNLOCK_ZONE(zone); UNLOCK_ZONE(zone);
} }
LOCK_ZONE(zone);
isc_time_settoepoch(&zone->refreshkeytime); isc_time_settoepoch(&zone->refreshkeytime);
/* /*
@@ -19046,13 +19050,11 @@ zone_rekey(dns_zone_t *zone) {
if (kasp != NULL && nexttime > 0) { if (kasp != NULL && nexttime > 0) {
isc_time_t timenext; isc_time_t timenext;
LOCK_ZONE(zone);
DNS_ZONE_TIME_ADD(&timenow, nexttime - now, &timenext); DNS_ZONE_TIME_ADD(&timenow, nexttime - now, &timenext);
zone->refreshkeytime = timenext; zone->refreshkeytime = timenext;
UNLOCK_ZONE(zone);
zone_settimer(zone, &timenow); zone_settimer(zone, &timenow);
isc_time_formattimestamp(&zone->refreshkeytime, timebuf, 80); isc_time_formattimestamp(&zone->refreshkeytime, timebuf, 80);
dnssec_log(zone, ISC_LOG_DEBUG(3), dnssec_log(zone, ISC_LOG_DEBUG(3),
"next key event in %u seconds: %s", "next key event in %u seconds: %s",
(nexttime - now), timebuf); (nexttime - now), timebuf);
@@ -19067,11 +19069,9 @@ zone_rekey(dns_zone_t *zone) {
isc_time_t timethen; isc_time_t timethen;
isc_stdtime_t then; isc_stdtime_t then;
LOCK_ZONE(zone);
DNS_ZONE_TIME_ADD(&timenow, zone->refreshkeyinterval, DNS_ZONE_TIME_ADD(&timenow, zone->refreshkeyinterval,
&timethen); &timethen);
zone->refreshkeytime = timethen; zone->refreshkeytime = timethen;
UNLOCK_ZONE(zone);
for (key = ISC_LIST_HEAD(dnskeys); for (key = ISC_LIST_HEAD(dnskeys);
key != NULL; key != NULL;
@@ -19084,13 +19084,11 @@ zone_rekey(dns_zone_t *zone) {
} }
DNS_ZONE_TIME_ADD(&timenow, then - now, &timethen); DNS_ZONE_TIME_ADD(&timenow, then - now, &timethen);
LOCK_ZONE(zone);
if (isc_time_compare(&timethen, if (isc_time_compare(&timethen,
&zone->refreshkeytime) < 0) &zone->refreshkeytime) < 0)
{ {
zone->refreshkeytime = timethen; zone->refreshkeytime = timethen;
} }
UNLOCK_ZONE(zone);
} }
zone_settimer(zone, &timenow); zone_settimer(zone, &timenow);
@@ -19098,6 +19096,7 @@ zone_rekey(dns_zone_t *zone) {
isc_time_formattimestamp(&zone->refreshkeytime, timebuf, 80); isc_time_formattimestamp(&zone->refreshkeytime, timebuf, 80);
dnssec_log(zone, ISC_LOG_INFO, "next key event: %s", timebuf); dnssec_log(zone, ISC_LOG_INFO, "next key event: %s", timebuf);
} }
UNLOCK_ZONE(zone);
result = ISC_R_SUCCESS; result = ISC_R_SUCCESS;