diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-11-25 18:40:14 +0100 |
|---|---|---|
| committer | pespin <pespin@sysmocom.de> | 2020-11-30 14:32:32 +0000 |
| commit | 9402d1eeb7a85e78f7b36640df534f1d601b9f55 (patch) | |
| tree | e3f7f5f73616c8ef9f4e9092de75d98493aecf63 /src/ipaccess | |
| parent | f81c4bd681ac7fd63a8f56ae4f8a82c5bdd436a9 (diff) | |
ipaccess-proxy: 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: Iff920ff3dbeb48bd871b7578470f27fe9d0f9516
Fixes: OS#4865
Diffstat (limited to 'src/ipaccess')
| -rw-r--r-- | src/ipaccess/ipaccess-proxy.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index 47465b4ea..d67603833 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -1086,14 +1086,22 @@ static int ipaccess_proxy_setup(void) return ret; } -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 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(tall_bsc_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; case SIGUSR1: talloc_report_full(tall_bsc_ctx, stderr); break; |