From: Evan Hunt <each@isc.org>
Date: Wed, 21 Apr 2021 17:28:26 +0000 (-0700)
Subject: fix TLS timeout recovery
X-Git-Tag: v9.17.13~45^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23ec0112989861e675a46aaa4f9ad3e05e1f8217;p=thirdparty%2Fbind9.git

fix TLS timeout recovery

the destruction of the socket in tls_failed_read_cb() needs to be
conditional; if reached due to a timeout on a timer that has
subsequently been reset, the socket must not be destroyed.
---

diff --git a/lib/isc/netmgr/tlsstream.c b/lib/isc/netmgr/tlsstream.c
index a68838a7755..07f3d264275 100644
--- a/lib/isc/netmgr/tlsstream.c
+++ b/lib/isc/netmgr/tlsstream.c
@@ -168,7 +168,10 @@ tls_senddone(isc_nmhandle_t *handle, isc_result_t eresult, void *cbarg) {
 
 static void
 tls_failed_read_cb(isc_nmsocket_t *sock, const isc_result_t result) {
+	bool destroy = true;
+
 	REQUIRE(VALID_NMSOCK(sock));
+	REQUIRE(result != ISC_R_SUCCESS);
 
 	if (!sock->tlsstream.server &&
 	    (sock->tlsstream.state == TLS_INIT ||
@@ -188,14 +191,22 @@ tls_failed_read_cb(isc_nmsocket_t *sock, const isc_result_t result) {
 		req = isc__nm_uvreq_get(sock->mgr, sock);
 		req->cb.recv = sock->recv_cb;
 		req->cbarg = sock->recv_cbarg;
-		req->handle = NULL;
 		isc_nmhandle_attach(sock->statichandle, &req->handle);
-		isc__nmsocket_clearcb(sock);
+		if (result != ISC_R_TIMEDOUT) {
+			isc__nmsocket_clearcb(sock);
+		}
 		isc__nm_readcb(sock, req, result);
+		if (result == ISC_R_TIMEDOUT &&
+		    isc__nmsocket_timer_running(sock->outerhandle->sock))
+		{
+			destroy = false;
+		}
 	}
 
-	isc__nmsocket_prep_destroy(sock);
-	isc__nmsocket_detach(&sock);
+	if (destroy) {
+		isc__nmsocket_prep_destroy(sock);
+		isc__nmsocket_detach(&sock);
+	}
 }
 
 static void
@@ -520,6 +531,7 @@ tls_readcb(isc_nmhandle_t *handle, isc_result_t result, isc_region_t *region,
 		tls_failed_read_cb(tlssock, result);
 		return;
 	}
+
 	tls_do_bio(tlssock, region, NULL, false);
 }