From: Aram Sargsyan <aram@isc.org>
Date: Tue, 1 Oct 2024 14:16:47 +0000 (+0000)
Subject: Don't ignore the local port number in dns_dispatch_add() for TCP
X-Git-Tag: v9.21.2~4^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d49a8f518a8ffe4b2db2ea20ed3171723ff0404b;p=thirdparty%2Fbind9.git

Don't ignore the local port number in dns_dispatch_add() for TCP

The dns_dispatch_add() function registers the 'resp' entry in
'disp->mgr->qids' hash table with 'resp->port' being 0, but in
tcp_recv_success(), when looking up an entry in the hash table
after a successfully received data the port is used, so if the
local port was set (i.e. it was not 0) it fails to find the
entry and results in an unexpected error.

Set the 'resp->port' to the given local port value extracted from
'disp->local'.
---

diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index 284646b60f3..e147912a1be 100644
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -1140,6 +1140,20 @@ else
 fi
 
 if [ -x "$MDIG" ]; then
+  n=$((n + 1))
+  echo_i "checking mdig +tcp works with a source address and port ($n)"
+  ret=0
+  # When running more than once in quick succession with a source address#port,
+  # we can get a "response failed with address not available" error because
+  # the address#port is still busy, but we are not interested in that error,
+  # as we are only looking for the unexpected error case, that's why we ignore
+  # the return code from mdig, but we check for the unexpected error message
+  # using grep. See GitLab #4969.
+  mdig_with_opts -b "10.53.0.3#${EXTRAPORT8}" +tcp @10.53.0.3 example >dig.out.test$n 2>&1 || true
+  grep -F "unexpected error" dig.out.test$n >/dev/null && ret=1
+  if [ $ret -ne 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+
   n=$((n + 1))
   echo_i "check that mdig handles malformed option '+ednsopt=:' gracefully ($n)"
   ret=0
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 5a08a065770..be6f3786880 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -1433,6 +1433,7 @@ dns_dispatch_add(dns_dispatch_t *disp, isc_loop_t *loop,
 	dns_dispentry_t *resp = isc_mem_get(disp->mctx, sizeof(*resp));
 	*resp = (dns_dispentry_t){
 		.timeout = timeout,
+		.port = localport,
 		.peer = *dest,
 		.loop = loop,
 		.connected = connected,