mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Call isccc_ccmsg_invalidate() when shutting down the connection

Browse Source 
Previously, the isccc_ccmsg_invalidate() was called from conn_free() and
this could lead to netmgr calling control_recvmessage() after we
detached the reading controlconnection_t reference, but it wouldn't be
the last reference because controlconnection_t is also attached/detached
when sending response or running command asynchronously.

Instead, move the isccc_ccmsg_invalidate() call to control_recvmessage()
error handling path to make sure that control_recvmessage() won't be
ever called again from the netmgr.
This commit is contained in:
Ondřej Surý
2023-10-27 10:16:13 +02:00
parent 07f569e2f6
commit 2d2c249958
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/named/controlconf.c
View File

@@ -407,9 +407,7 @@ control_recvmessage(isc_nmhandle_t *handle ISC_ATTR_UNUSED, isc_result_t result,
isccc_time_t exp; isccc_time_t exp;
uint32_t nonce; uint32_t nonce;
if (conn->shuttingdown) { INSIST(!conn->shuttingdown);
return;
}
/* Is the server shutting down? */ /* Is the server shutting down? */
if (listener->controls->shuttingdown) { if (listener->controls->shuttingdown) {
@@ -539,6 +537,9 @@ control_recvmessage(isc_nmhandle_t *handle ISC_ATTR_UNUSED, isc_result_t result,
return; return;
cleanup: cleanup:
/* Make sure no read callbacks are called again */
isccc_ccmsg_invalidate(&conn->ccmsg);
conn->shuttingdown = true; conn->shuttingdown = true;
REQUIRE(isc_tid() == 0); REQUIRE(isc_tid() == 0);
@@ -564,8 +565,6 @@ conn_free(controlconnection_t *conn) {
} }
#endif /* ifdef ENABLE_AFL */ #endif /* ifdef ENABLE_AFL */
isccc_ccmsg_invalidate(&conn->ccmsg);
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_CONTROL, ISC_LOG_DEBUG(3), NAMED_LOGMODULE_CONTROL, ISC_LOG_DEBUG(3),
"freeing control connection"); "freeing control connection");