ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Clear the callbacks when isc_nm_stoplistening() is called

Browse Source 
When we are closing the listening sockets, there's a time window in
which the TCP connection could be accepted although the respective
stoplistening function has already returned to control to the caller.
Clear the accept callback function early, so it doesn't get called when
we are not interested in the incoming connections anymore.
This commit is contained in:
Ondřej Surý
2022-08-24 14:59:50 +02:00
parent 4d07768a09
commit 718e92c31a
8 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/isc/netmgr/tlsstream.c
View File

@@ -340,9 +340,13 @@ tls_try_handshake(isc_nmsocket_t *sock, isc_result_t *presult) {
isc__nmsocket_log_tls_session_reuse(sock, sock->tlsstream.tls);
tlshandle = isc__nmhandle_get(sock, &sock->peer, &sock->iface);
if (sock->tlsstream.server) {
result = sock->listener->accept_cb(
tlshandle, result,
sock->listener->accept_cbarg);
if (sock->listener->accept_cb == NULL) {
result = ISC_R_CANCELED;
} else {
result = sock->listener->accept_cb(
tlshandle, result,
sock->listener->accept_cbarg);
}
} else {
tls_call_connect_cb(sock, tlshandle, result);
}
@@ -931,6 +935,8 @@ void
isc__nm_tls_stoplistening(isc_nmsocket_t *sock) {
REQUIRE(VALID_NMSOCK(sock));
REQUIRE(sock->type == isc_nm_tlslistener);
REQUIRE(sock->tlsstream.tls == NULL);
REQUIRE(sock->tlsstream.ctx == NULL);
if (!atomic_compare_exchange_strong(&sock->closing, &(bool){ false },
true)) {
@@ -942,9 +948,6 @@ isc__nm_tls_stoplistening(isc_nmsocket_t *sock) {
sock->recv_cb = NULL;
sock->recv_cbarg = NULL;
INSIST(sock->tlsstream.tls == NULL);
INSIST(sock->tlsstream.ctx == NULL);
if (sock->outer != NULL) {
isc_nm_stoplistening(sock->outer);
isc__nmsocket_detach(&sock->outer);