Don't fetch DNSKEY when fuzzing resolver

(cherry picked from commit cb3208aa4361587a7c246381d402c333522a3024)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 801956c7cd33882634d4edd48f43ea94a6cbb431..a9d55d1c6f11b606a32a20f1d92d7510f6f5e9af 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -548,9 +548,9 @@ struct dns_resolver {
 #define NEGATIVE(r) (((r)->attributes & DNS_RDATASETATTR_NEGATIVE) != 0)
 
 #ifdef ENABLE_AFL
-static isc_boolean_t fuzzing_resolver = ISC_FALSE;
+isc_boolean_t dns_fuzzing_resolver = ISC_FALSE;
 void dns_resolver_setfuzzing() {
-       fuzzing_resolver = ISC_TRUE;
+       dns_fuzzing_resolver = ISC_TRUE;
 }
 #endif
 
@@ -2125,7 +2125,7 @@ add_bad_edns(fetchctx_t *fctx, isc_sockaddr_t *address) {
        isc_sockaddr_t *sa;
 
 #ifdef ENABLE_AFL
-       if (fuzzing_resolver)
+       if (dns_fuzzing_resolver)
                return;
 #endif
        if (bad_edns(fctx, address))
@@ -3108,7 +3108,7 @@ mark_bad(fetchctx_t *fctx) {
        isc_boolean_t all_bad = ISC_TRUE;
 
 #ifdef ENABLE_AFL
-       if (fuzzing_resolver)
+       if (dns_fuzzing_resolver)
                return ISC_FALSE;
 #endif
 
@@ -3188,7 +3188,7 @@ add_bad(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo, isc_result_t reason,
        isc_sockaddr_t *address = &addrinfo->sockaddr;
 
 #ifdef ENABLE_AFL
-       if (fuzzing_resolver)
+       if (dns_fuzzing_resolver)
                return;
 #endif
 
@@ -9161,7 +9161,7 @@ rctx_done(respctx_t *rctx, isc_result_t result) {
        }
 
 #ifdef ENABLE_AFL
-       if (fuzzing_resolver &&
+       if (dns_fuzzing_resolver &&
            (rctx->next_server || rctx->resend || rctx->nextitem))
        {
                if (rctx->nextitem) {
@@ -10601,7 +10601,7 @@ dns_resolver_addbadcache(dns_resolver_t *resolver, const dns_name_t *name,
                         dns_rdatatype_t type, isc_time_t *expire)
 {
 #ifdef ENABLE_AFL
-       if (!fuzzing_resolver)
+       if (!dns_fuzzing_resolver)
 #endif
        {
                dns_badcache_add(resolver->badcache, name, type,

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 8bd2d2e0bf66b0ae7d618d2beaa9f8ff2a336e6a..472e04bbdd1b5f3b7615c51b63c0ebeeea849e7e 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -186,6 +186,10 @@ typedef struct dns_include dns_include_t;
 #define ZONEDB_UNLOCK(l, t)    UNLOCK(l)
 #endif
 
+#ifdef ENABLE_AFL
+extern isc_boolean_t dns_fuzzing_resolver;
+#endif
+
 struct dns_zone {
        /* Unlocked */
        unsigned int            magic;
@@ -9890,6 +9894,10 @@ zone_refreshkeys(dns_zone_t *zone) {
                 * as the latter will have a lower trust level due to not being
                 * validated until keyfetch_done() is called.
                 */
+
+#ifdef ENABLE_AFL
+                if (dns_fuzzing_resolver == ISC_FALSE) {
+#endif
                result = dns_resolver_createfetch(zone->view->resolver,
                                                  kname, dns_rdatatype_dnskey,
                                                  NULL, NULL, NULL,
@@ -9901,6 +9909,11 @@ zone_refreshkeys(dns_zone_t *zone) {
                                                  &kfetch->dnskeyset,
                                                  &kfetch->dnskeysigset,
                                                  &kfetch->fetch);
+#ifdef ENABLE_AFL
+                } else {
+                        result = ISC_R_FAILURE;
+                }
+#endif
                if (result == ISC_R_SUCCESS)
                        fetching = ISC_TRUE;
                else {