diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-11-25 19:09:00 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-11-25 20:21:21 +0100 |
| commit | 090f1cebe80b754ed71de483157c1c9f493c1b72 (patch) | |
| tree | bd279d522c60862ce7f583e74efdd5efa39af400 | |
| parent | 44d72333ad29df02bd546cc2f2f3955b982bc03e (diff) | |
lc15-mgr: generate coredump and exit upon SIGABRT receivedneels/pre_sapi_fix
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 (kill -SIGABRT),
then the process would print the talloc report and continue running,
which is not desired.
Change-Id: I6ddc04c5815858c7dfab04ffdac52bce2e7940a1
Fixes: OS#4865
| -rw-r--r-- | src/osmo-bts-lc15/misc/lc15bts_mgr.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/osmo-bts-lc15/misc/lc15bts_mgr.c b/src/osmo-bts-lc15/misc/lc15bts_mgr.c index da21c9d0..b258d0cb 100644 --- a/src/osmo-bts-lc15/misc/lc15bts_mgr.c +++ b/src/osmo-bts-lc15/misc/lc15bts_mgr.c @@ -1,7 +1,7 @@ /* Main program for NuRAN Wireless Litecell 1.5 BTS management daemon */ /* Copyright (C) 2015 by Yves Godin <support@nuranwireless.com> - * + * * Based on sysmoBTS: * sysmobts_mgr.c * (C) 2012 by Harald Welte <laforge@gnumonks.org> @@ -220,11 +220,11 @@ static int parse_options(int argc, char **argv) return 0; } -static void signal_handler(int signal) +static void signal_handler(int signum) { - fprintf(stderr, "signal %u received\n", signal); + fprintf(stderr, "signal %u received\n", signum); - switch (signal) { + switch (signum) { case SIGINT: case SIGTERM: lc15bts_check_temp(no_rom_write); @@ -234,6 +234,16 @@ static void signal_handler(int signal) exit(0); break; case SIGABRT: + /* 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_full(tall_mgr_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; case SIGUSR1: case SIGUSR2: talloc_report_full(tall_mgr_ctx, stderr); @@ -293,6 +303,7 @@ int main(int argc, char **argv) osmo_init_ignore_signals(); signal(SIGINT, &signal_handler); signal(SIGTERM, &signal_handler); + signal(SIGABRT, &signal_handler); signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); |