<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcap/+/21359">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">main: generate coredump and exit upon SIGABRT received<br><br>Previous code relied on abort() switching sigaction to SIG_FDL +<br>retriggering SIGABRT in case the signal handler returns, which would<br>then generate the coredump + terminate the process.<br>However, if a SIGABRT is received from somewhere else (kill -SIGABRT),<br>then the process would print the talloc report and continue running,<br>which is not desired.<br><br>Fixes: OS#4865<br>Change-Id: I39367aa480445fe961dcfa308789b3fc0cf759a1<br>---<br>M src/osmo_client_main.c<br>M src/osmo_server_main.c<br>2 files changed, 28 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/59/21359/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c</span><br><span>index 5a8da96..c7d68d4 100644</span><br><span>--- a/src/osmo_client_main.c</span><br><span>+++ b/src/osmo_client_main.c</span><br><span>@@ -150,17 +150,26 @@</span><br><span>     }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void signal_handler(int signal)</span><br><span style="color: hsl(120, 100%, 40%);">+static void signal_handler(int signum)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   fprintf(stdout, "signal %u received\n", signal);</span><br><span style="color: hsl(120, 100%, 40%);">+    fprintf(stdout, "signal %u received\n", signum);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  switch (signal) {</span><br><span style="color: hsl(120, 100%, 40%);">+     switch (signum) {</span><br><span>    case SIGINT:</span><br><span>                 exit(0);</span><br><span>             break;</span><br><span>       case SIGABRT:</span><br><span style="color: hsl(0, 100%, 40%);">-           /* in case of abort, we want to obtain a talloc report</span><br><span style="color: hsl(0, 100%, 40%);">-           * and then return to the caller, who will abort the process */</span><br><span style="color: hsl(120, 100%, 40%);">+               /* in case of abort, we want to obtain a talloc report and</span><br><span style="color: hsl(120, 100%, 40%);">+             * then run default SIGABRT handler, who will generate coredump</span><br><span style="color: hsl(120, 100%, 40%);">+                * and abort the process. abort() should do this for us after we</span><br><span style="color: hsl(120, 100%, 40%);">+               * return, but program wouldn't exit if an external SIGABRT is</span><br><span style="color: hsl(120, 100%, 40%);">+             * received.</span><br><span style="color: hsl(120, 100%, 40%);">+           */</span><br><span style="color: hsl(120, 100%, 40%);">+           talloc_report(tall_vty_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+          talloc_report_full(tall_cli_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+             signal(SIGABRT, SIG_DFL);</span><br><span style="color: hsl(120, 100%, 40%);">+             raise(SIGABRT);</span><br><span style="color: hsl(120, 100%, 40%);">+               break;</span><br><span>       case SIGUSR1:</span><br><span>                talloc_report(tall_vty_ctx, stderr);</span><br><span>                 talloc_report_full(tall_cli_ctx, stderr);</span><br><span>diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c</span><br><span>index 22d0f22..51441a7 100644</span><br><span>--- a/src/osmo_server_main.c</span><br><span>+++ b/src/osmo_server_main.c</span><br><span>@@ -160,17 +160,26 @@</span><br><span>       }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void signal_handler(int signal)</span><br><span style="color: hsl(120, 100%, 40%);">+static void signal_handler(int signum)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   fprintf(stdout, "signal %u received\n", signal);</span><br><span style="color: hsl(120, 100%, 40%);">+    fprintf(stdout, "signal %u received\n", signum);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  switch (signal) {</span><br><span style="color: hsl(120, 100%, 40%);">+     switch (signum) {</span><br><span>    case SIGINT:</span><br><span>                 exit(0);</span><br><span>             break;</span><br><span>       case SIGABRT:</span><br><span style="color: hsl(0, 100%, 40%);">-           /* in case of abort, we want to obtain a talloc report</span><br><span style="color: hsl(0, 100%, 40%);">-           * and then return to the caller, who will abort the process */</span><br><span style="color: hsl(120, 100%, 40%);">+               /* in case of abort, we want to obtain a talloc report and</span><br><span style="color: hsl(120, 100%, 40%);">+             * then run default SIGABRT handler, who will generate coredump</span><br><span style="color: hsl(120, 100%, 40%);">+                * and abort the process. abort() should do this for us after we</span><br><span style="color: hsl(120, 100%, 40%);">+               * return, but program wouldn't exit if an external SIGABRT is</span><br><span style="color: hsl(120, 100%, 40%);">+             * received.</span><br><span style="color: hsl(120, 100%, 40%);">+           */</span><br><span style="color: hsl(120, 100%, 40%);">+           talloc_report(tall_vty_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+          talloc_report_full(tall_srv_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+             signal(SIGABRT, SIG_DFL);</span><br><span style="color: hsl(120, 100%, 40%);">+             raise(SIGABRT);</span><br><span style="color: hsl(120, 100%, 40%);">+               break;</span><br><span>       case SIGUSR1:</span><br><span>                talloc_report(tall_vty_ctx, stderr);</span><br><span>                 talloc_report_full(tall_srv_ctx, stderr);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcap/+/21359">change 21359</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcap/+/21359"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcap </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I39367aa480445fe961dcfa308789b3fc0cf759a1 </div>
<div style="display:none"> Gerrit-Change-Number: 21359 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>