mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 16:45:24 +00:00
Code Issues Releases Wiki Activity

Merge branch '4508-crash-in-host' into 'main'

Browse Source 
Fix a possible dig/host crash in "NS search" mode

Closes #4508

See merge request isc-projects/bind9!8635
This commit is contained in:
Arаm Sаrgsyаn
2024-01-11 09:54:01 +00:00
parent 31b1f3c3bc 1246d982a2
commit a6fb918454
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
6320. [bug] Fix a possible crash in 'dig +nssearch +nofail' and
'host -C' commands when one of the name servers returns
SERVFAIL. [GL #4508]
6319. [placeholder] 6319. [placeholder]
6318. [placeholder] 6318. [placeholder]

19
bin/dig/dighost.c
View File

@@ -4354,29 +4354,32 @@ recv_done(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
if ((msg->rcode == dns_rcode_servfail && !l->servfail_stops) || if ((msg->rcode == dns_rcode_servfail && !l->servfail_stops) ||
(check_ra && (msg->flags & DNS_MESSAGEFLAG_RA) == 0 && l->recurse)) (check_ra && (msg->flags & DNS_MESSAGEFLAG_RA) == 0 && l->recurse))
{ {
const char *err = (msg->rcode == dns_rcode_servfail &&
!l->servfail_stops)
? "SERVFAIL reply"
: "recursion not available";
dig_query_t *next = ISC_LIST_NEXT(query, link); dig_query_t *next = ISC_LIST_NEXT(query, link);
if (l->current_query == query) { if (l->current_query == query) {
query_detach(&l->current_query); query_detach(&l->current_query);
} }
if (next != NULL) { if (next != NULL && (!l->ns_search_only || l->trace_root)) {
dighost_comments(l,
"Got %s from %s, trying next server",
err, query->servname);
debug("sending query %p", next); debug("sending query %p", next);
if (l->tcp_mode) { if (l->tcp_mode) {
start_tcp(next); start_tcp(next);
} else { } else {
start_udp(next); start_udp(next);
} }
dighost_comments(l,
"Got %s from %s, trying next "
"server",
msg->rcode == dns_rcode_servfail
? "SERVFAIL reply"
: "recursion not available",
query->servname);
if (check_if_queries_done(l, query)) { if (check_if_queries_done(l, query)) {
goto cancel_lookup; goto cancel_lookup;
} }
goto detach_query; goto detach_query;
} else {
dighost_comments(l, "Got %s from %s", err,
query->servname);
} }
} }