diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-11-25 17:08:18 +0100 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2020-11-25 20:46:46 +0000 |
| commit | 55d7ee57cf578ed22d9efa0f7d9fe7252a2ccf8e (patch) | |
| tree | dd468f5247237f0620d57b94774e87723d5af530 /src | |
| parent | baa25b0d80bb910adbde019183624410a55dab44 (diff) | |
main: generate coredump and exit upon SIGABRT received
Previous code relied on abort() switching sigaction to SIG_FDL +
retriggering SIGABRT in case the signal handler returns, which would
then generate the coredump + terminate the process.
However, if a SIGABRT is received from somewhere else (killall -SIGABRT
osmo-bsc), then the process would print the talloc report and continue
running, which is not desired.
Change-Id: I125288283af630efa20d64505e319636964a0982
Fixes: OS#4865
Diffstat (limited to 'src')
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_main.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index aa45bf07f..cc02c71fa 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -682,11 +682,11 @@ static struct vty_app_info vty_info = { }; extern int bsc_shutdown_net(struct gsm_network *net); -static void signal_handler(int signal) +static void signal_handler(int signum) { - fprintf(stdout, "signal %u received\n", signal); + fprintf(stdout, "signal %u received\n", signum); - switch (signal) { + switch (signum) { case SIGINT: case SIGTERM: bsc_shutdown_net(bsc_gsmnet); @@ -695,8 +695,17 @@ static void signal_handler(int signal) exit(0); break; case SIGABRT: - /* in case of abort, we want to obtain a talloc report - * and then return to the caller, who will abort the process */ + /* in case of abort, we want to obtain a talloc report and + * then run default SIGABRT handler, who will generate coredump + * and abort the process. abort() should do this for us after we + * return, but program wouldn't exit if an external SIGABRT is + * received. + */ + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_bsc_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; case SIGUSR1: talloc_report(tall_vty_ctx, stderr); talloc_report_full(tall_bsc_ctx, stderr); |