Ensure all zone_settimer() calls are done on locked zone

(cherry picked from commit cf48e8eb326f824170f2069e5d5c33992b1783a4)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 2d3189fa6d45d531fb4ca9bd246adec39d6c8e93..92a61f92cc4eb6fec8914b946e3355912e10ad38 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -10613,7 +10613,9 @@ zone_maintenance(dns_zone_t *zone) {
        default:
                break;
        }
+       LOCK_ZONE(zone);
        zone_settimer(zone, &now);
+       UNLOCK_ZONE(zone);
 }
 
 void
@@ -13452,6 +13454,7 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) {
        isc_result_t result;
 
        REQUIRE(DNS_ZONE_VALID(zone));
+       REQUIRE(LOCKED_ZONE(zone));
        ENTER;
 
        if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_EXITING))
@@ -18814,6 +18817,7 @@ zone_rekey(dns_zone_t *zone) {
                UNLOCK_ZONE(zone);
        }
 
+       LOCK_ZONE(zone);
        isc_time_settoepoch(&zone->refreshkeytime);
 
        /*
@@ -18825,11 +18829,9 @@ zone_rekey(dns_zone_t *zone) {
                isc_time_t timethen;
                isc_stdtime_t then;
 
-               LOCK_ZONE(zone);
                DNS_ZONE_TIME_ADD(&timenow, zone->refreshkeyinterval,
                                  &timethen);
                zone->refreshkeytime = timethen;
-               UNLOCK_ZONE(zone);
 
                for (key = ISC_LIST_HEAD(dnskeys);
                     key != NULL;
@@ -18842,13 +18844,11 @@ zone_rekey(dns_zone_t *zone) {
                        }
 
                        DNS_ZONE_TIME_ADD(&timenow, then - now, &timethen);
-                       LOCK_ZONE(zone);
                        if (isc_time_compare(&timethen,
                                             &zone->refreshkeytime) < 0)
                        {
                                zone->refreshkeytime = timethen;
                        }
-                       UNLOCK_ZONE(zone);
                }
 
                zone_settimer(zone, &timenow);
@@ -18856,6 +18856,7 @@ zone_rekey(dns_zone_t *zone) {
                isc_time_formattimestamp(&zone->refreshkeytime, timebuf, 80);
                dnssec_log(zone, ISC_LOG_INFO, "next key event: %s", timebuf);
        }
+       UNLOCK_ZONE(zone);
 
        result = ISC_R_SUCCESS;