diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-11-25 19:11:43 +0100 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-11-25 19:11:43 +0100 |
commit | 716a4db54ca943ab96c5a290c7d0f0446c57ac30 (patch) | |
tree | 559d4e4548fe04ea0dde436627557d5a0e0811cc | |
parent | 5899cb4fbf96ac89bf1d3363781624e3f8567644 (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 (kill -SIGABRT),
then the process would print the talloc report and continue running,
which is not desired.
Fixes: OS#4865
Change-Id: I39367aa480445fe961dcfa308789b3fc0cf759a1
-rw-r--r-- | src/osmo_client_main.c | 19 | ||||
-rw-r--r-- | src/osmo_server_main.c | 19 |
2 files changed, 28 insertions, 10 deletions
diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c index 5a8da96..c7d68d4 100644 --- a/src/osmo_client_main.c +++ b/src/osmo_client_main.c @@ -150,17 +150,26 @@ static void handle_options(int argc, char **argv) } } -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: 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_cli_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; case SIGUSR1: talloc_report(tall_vty_ctx, stderr); talloc_report_full(tall_cli_ctx, stderr); diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 22d0f22..51441a7 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -160,17 +160,26 @@ static void handle_options(int argc, char **argv) } } -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: 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_srv_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; case SIGUSR1: talloc_report(tall_vty_ctx, stderr); talloc_report_full(tall_srv_ctx, stderr); |