mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Merge branch '3401-race-condition-in-route_connected' into 'main'

Browse Source 
Resolve "race condition in route_connected() leads to crash on startup/shutdown"

Closes #3401

See merge request isc-projects/bind9!6429
This commit is contained in:
Arаm Sаrgsyаn
2022-06-14 15:31:40 +00:00
parent 8f4b11773b 4b0e7e41fc
commit 6923f7973b
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
5908. [bug] Fix race conditions in route_connected(). [GL #3401]
5907. [bug] Fix a crash in dig NS search mode when one of the NS 5907. [bug] Fix a crash in dig NS search mode when one of the NS
server queries fail. [GL #3207] server queries fail. [GL #3207]

27
lib/ns/interfacemgr.c
View File

@@ -262,12 +262,12 @@ route_connected(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
"route_connected: %s", isc_result_totext(eresult)); "route_connected: %s", isc_result_totext(eresult));
if (eresult != ISC_R_SUCCESS) { if (eresult != ISC_R_SUCCESS) {
ns_interfacemgr_detach(&mgr);
return; return;
} }
INSIST(mgr->route == NULL); INSIST(mgr->route == NULL);
ns_interfacemgr_attach(mgr, &(ns_interfacemgr_t *){ NULL });
isc_nmhandle_attach(handle, &mgr->route); isc_nmhandle_attach(handle, &mgr->route);
isc_nm_read(handle, route_recv, mgr); isc_nm_read(handle, route_recv, mgr);
} }
@@ -331,15 +331,6 @@ ns_interfacemgr_create(isc_mem_t *mctx, ns_server_t *sctx,
UNUSED(geoip); UNUSED(geoip);
#endif /* if defined(HAVE_GEOIP2) */ #endif /* if defined(HAVE_GEOIP2) */
if (scan) {
result = isc_nm_routeconnect(nm, route_connected, mgr);
if (result != ISC_R_SUCCESS) {
isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_INFO,
"unable to open route socket: %s",
isc_result_totext(result));
}
}
isc_refcount_init(&mgr->references, 1); isc_refcount_init(&mgr->references, 1);
mgr->magic = IFMGR_MAGIC; mgr->magic = IFMGR_MAGIC;
*mgrp = mgr; *mgrp = mgr;
@@ -353,6 +344,22 @@ ns_interfacemgr_create(isc_mem_t *mctx, ns_server_t *sctx,
RUNTIME_CHECK(result == ISC_R_SUCCESS); RUNTIME_CHECK(result == ISC_R_SUCCESS);
} }
if (scan) {
ns_interfacemgr_t *imgr = NULL;
ns_interfacemgr_attach(mgr, &imgr);
result = isc_nm_routeconnect(nm, route_connected, imgr);
if (result == ISC_R_NOTIMPLEMENTED) {
ns_interfacemgr_detach(&imgr);
}
if (result != ISC_R_SUCCESS) {
isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_INFO,
"unable to open route socket: %s",
isc_result_totext(result));
}
}
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
cleanup_listenon: cleanup_listenon: