From ee53b9558fb73dc0c2f328fe91421f2c32e9a369 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 3 Nov 2020 11:25:55 +1100 Subject: [PATCH 1/2] Call nta_detach() before dns_view_weakdetach() so view is available. (cherry picked from commit ea956976d1e89f49570a4690fbad377e4f607c77) --- lib/dns/nta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dns/nta.c b/lib/dns/nta.c index 79058bb9b5..73febe44ed 100644 --- a/lib/dns/nta.c +++ b/lib/dns/nta.c @@ -283,8 +283,8 @@ checkbogus(isc_task_t *task, isc_event_t *event) { &nta->sigrdataset, &nta->fetch); if (result != ISC_R_SUCCESS) { - dns_view_weakdetach(&view); nta_detach(view->mctx, &nta); + dns_view_weakdetach(&view); } } From 9bc7076906c36b23a043e5fa0bbb5358a6a219a2 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 3 Nov 2020 11:30:05 +1100 Subject: [PATCH 2/2] Add CHANGES for [GL #2244] (cherry picked from commit 2ef0f252a8a6baecdff61d927d4583e6da879f30) --- CHANGES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index c213a2ef79..308ebac320 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +5527. [bug] There was a NULL pointer dereference if the creation + of the fetch to determine if a negative trust anchor + was still valid failed. [GL #2244] + 5523. [bug] The initial lookup of a zone transitioning to/from the signed state could fail if the DNSKEY RRset was not found. Subsequent lookups would succeed.