aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2020-11-25 18:03:21 +0100
committerPau Espin Pedrol <pespin@sysmocom.de>2020-11-25 18:22:21 +0100
commit7ffc6603e2cb8b64be44ab31298d22ac21ea1543 (patch)
tree0a7c697646cee243bd988cd5b9bb62d9c3c98173 /src
parent826eaa327bfd7af22b857684de21c545be6518b1 (diff)
gtphub: 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. Change-Id: I1cab4a716cf2fda6353f698888edbcec6228d78b Fixes: OS#4865
Diffstat (limited to 'src')
-rw-r--r--src/gtphub/gtphub_main.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/gtphub/gtphub_main.c b/src/gtphub/gtphub_main.c
index 665224a1..a9a7529c 100644
--- a/src/gtphub/gtphub_main.c
+++ b/src/gtphub/gtphub_main.c
@@ -95,11 +95,11 @@ void log_cfg(struct gtphub_cfg *cfg)
}
}
-static void signal_handler(int signal)
+static void signal_handler(int signum)
{
- fprintf(stdout, "signal %d received\n", signal);
+ fprintf(stdout, "signal %d received\n", signum);
- switch (signal) {
+ switch (signum) {
case SIGINT:
case SIGTERM:
osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL);
@@ -107,8 +107,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 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_full(osmo_gtphub_ctx, stderr);
+ signal(SIGABRT, SIG_DFL);
+ raise(SIGABRT);
+ break;
case SIGUSR1:
case SIGUSR2:
talloc_report_full(osmo_gtphub_ctx, stderr);