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

isc_loopmgr_pause was called inappropriately

Browse Source 
isc_loopmgr_pause can't be called before isc_loopmgr_run is
called as the thread ids are not yet valid.  If there is a
fatal error before isc_loopmgr_run is run then don't call
isc_loopmgr_pause.
This commit is contained in:
Mark Andrews
2023-04-11 15:32:51 +10:00
parent 453aaac2f0
commit be68dd62ea
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/named/include/named/globals.h
View File

@@ -53,6 +53,7 @@ EXTERN unsigned int named_g_cpus INIT(0);
EXTERN unsigned int named_g_udpdisp INIT(0); EXTERN unsigned int named_g_udpdisp INIT(0);
EXTERN isc_loop_t *named_g_mainloop INIT(NULL); EXTERN isc_loop_t *named_g_mainloop INIT(NULL);
EXTERN isc_loopmgr_t *named_g_loopmgr INIT(NULL); EXTERN isc_loopmgr_t *named_g_loopmgr INIT(NULL);
EXTERN bool named_g_loopmgr_running INIT(false);
EXTERN dns_dispatchmgr_t *named_g_dispatchmgr INIT(NULL); EXTERN dns_dispatchmgr_t *named_g_dispatchmgr INIT(NULL);
EXTERN unsigned int named_g_cpus_detected INIT(1); EXTERN unsigned int named_g_cpus_detected INIT(1);

4
bin/named/main.c
View File

@@ -1506,6 +1506,10 @@ main(int argc, char *argv[]) {
*/ */
isc_signal_start(named_g_server->sighup); isc_signal_start(named_g_server->sighup);
/*
* Pause the loop manager in fatal.
*/
named_g_loopmgr_running = true;
isc_loopmgr_run(named_g_loopmgr); isc_loopmgr_run(named_g_loopmgr);
#ifdef HAVE_LIBSCF #ifdef HAVE_LIBSCF

4
bin/named/server.c
View File

@@ -10286,7 +10286,9 @@ named_server_destroy(named_server_t **serverp) {
static void static void
fatal(const char *msg, isc_result_t result) { fatal(const char *msg, isc_result_t result) {
isc_loopmgr_pause(named_g_loopmgr); if (named_g_loopmgr_running) {
isc_loopmgr_pause(named_g_loopmgr);
}
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_SERVER, ISC_LOG_CRITICAL, "%s: %s", msg, NAMED_LOGMODULE_SERVER, ISC_LOG_CRITICAL, "%s: %s", msg,
isc_result_totext(result)); isc_result_totext(result));