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

Skip detach when delv's client never created

Browse source 
run_resolve allocates dns_client_t late, but the cleanup epilogue
called dns_client_detach() unconditionally. When convert_name() or
dns_client_create() failed first, the detach hit a NULL client and
the REQUIRE(DNS_CLIENT_VALID) inside it aborted the process with
SIGABRT instead of a clean error exit.

Guard the detach with a NULL check. Add a digdelv test that runs
delv on a query name whose first label exceeds 63 octets and
asserts the process does not exit 134.

Assisted-by: Claude:claude-opus-4-7
(cherry picked from commit dba102ef16)
This commit is contained in:
Ondřej Surý 2026-04-30 09:38:40 +02:00
parent 49509dcbae
commit 96d3b29968
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/delv/delv.c
View file

@ -1982,7 +1982,9 @@ cleanup:
isc_mem_put(mctx, namelist, sizeof(*namelist));
isc_loopmgr_shutdown(loopmgr);
dns_client_detach(&client);
if (client != NULL) {
dns_client_detach(&client);
}
}
static void

12
bin/tests/system/digdelv/tests.sh
View file

@ -1428,6 +1428,18 @@ if [ -x "$DELV" ]; then
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret))
n=$((n + 1))
echo_i "checking delv exits cleanly on malformed query name ($n)"
ret=0
longlabel="$(printf 'a%.0s' $(seq 1 64))"
delv_with_opts @10.53.0.3 -t a "$longlabel.example.com" >delv.out.test$n 2>&1
rc=$?
# Pre-fix: SIGABRT (exit 134) from dns_client_detach(NULL) in run_resolve cleanup.
[ $rc -eq 134 ] && ret=1
grep "label too long" delv.out.test$n >/dev/null || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret))
n=$((n + 1))
echo_i "checking delv with IPv6 on IPv4 does not work ($n)"
if testsock6 fd92:7065:b8e:ffff::3 2>/dev/null; then