From 3cd0c32b0a4dc93a1e3955e17ea8efa0804964ae Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 27 Oct 2022 13:22:11 +1100 Subject: [PATCH] Move the mapping of SIG and RRSIG to ANY dns_db_findext() asserts if RRSIG is passed to it and query_lookup_stale() failed to map RRSIG to ANY to prevent this. To avoid cases like this in the future, move the mapping of SIG and RRSIG to ANY for qctx->type to qctx_init(). Conflict: NA Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/ea79385990c564eb478c286c089ea7ed15520690 (cherry picked from commit 56eae064183488bcf7ff08c3edf59f2e1742c1b6) --- lib/ns/query.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/ns/query.c b/lib/ns/query.c index b822a29..1944a0b 100644 --- a/lib/ns/query.c +++ b/lib/ns/query.c @@ -5155,6 +5155,15 @@ qctx_init(ns_client_t *client, dns_fetchevent_t **eventp, dns_rdatatype_t qtype, qctx->result = ISC_R_SUCCESS; qctx->findcoveringnsec = qctx->view->synthfromdnssec; + /* + * If it's an RRSIG or SIG query, we'll iterate the node. + */ + if (qctx->qtype == dns_rdatatype_rrsig || + qctx->qtype == dns_rdatatype_sig) + { + qctx->type = dns_rdatatype_any; + } + CALL_HOOK_NORETURN(NS_QUERY_QCTX_INITIALIZED, qctx); } @@ -5295,14 +5304,6 @@ query_setup(ns_client_t *client, dns_rdatatype_t qtype) { CALL_HOOK(NS_QUERY_SETUP, &qctx); - /* - * If it's a SIG query, we'll iterate the node. - */ - if (qctx.qtype == dns_rdatatype_rrsig || - qctx.qtype == dns_rdatatype_sig) { - qctx.type = dns_rdatatype_any; - } - /* * Check SERVFAIL cache */ -- 2.33.0