upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 07:40:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

avoid retrying a server if its address is unusable

Browse source 
Previously, if there's no more server to try in force_next,
it attempted to retry the current server similar to a query
timeout case. But, force_next() is called only when the
current server's address is unusable and the query was not
even sent, so recvcount was not incremented, causing an
assertion failure.

We might be able to fix it so the retry doesn't cause a crash,
but it doesn't make sense to retry the server when its address
is known to be unusable. So, simply avoiding the retry would be
the easiest and safest way to prevent the crash.

(cherry picked from commit 022bf31fab)
This commit is contained in:
JINMEI Tatuya 2025-10-29 21:58:18 -07:00 committed by Arаm Sаrgsyаn
parent 6399f6f7d9
commit d896606282
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bin/dig/dighost.c
View file

@ -3438,19 +3438,11 @@ force_next(dig_query_t *query) {
return;
}
if (l->retries > 1) {
l->retries--;
debug("making new %s request, %d tries left",
l->tcp_mode ? "TCP" : "UDP", l->retries);
requeue_lookup(l, true);
lookup_detach(&l);
isc_refcount_decrement0(&recvcount);
debug("recvcount=%" PRIuFAST32,
isc_refcount_current(&recvcount));
query_detach(&query);
clear_current_lookup();
return;
}
/*
* We don't retry this server unlike other similar cases such as
* recv_done() because we're here due to get_address() failure,
* which shouldn't be transient.
*/
if (query->readhandle != NULL) {
isc_refcount_decrement0(&recvcount);