From: Jeff Lucovsky <jeff@lucovsky.org>
Date: Tue, 26 Apr 2022 18:46:06 +0000 (-0400)
Subject: signal/stack: Remove redundant initialization
X-Git-Tag: suricata-6.0.6~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c997a7e16b83d3b75bdbf85768146d3266b52ea;p=thirdparty%2Fsuricata.git

signal/stack: Remove redundant initialization

Ticket: 5228

This commit removes the redundant initialization of the stack-on-signal
functionality.
---

diff --git a/src/suricata.c b/src/suricata.c
index ee0c9e9bcc..efdd2cc298 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -2005,27 +2005,6 @@ static int MayDaemonize(SCInstance *suri)
 /* Initialize the user and group Suricata is to run as. */
 static int InitRunAs(SCInstance *suri)
 {
-    /* registering signals we use */
-#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-    UtilSignalHandlerSetup(SIGINT, SignalHandlerSigint);
-    UtilSignalHandlerSetup(SIGTERM, SignalHandlerSigterm);
-#if HAVE_LIBUNWIND
-    int enabled;
-    if (ConfGetBool("logging.stacktrace-on-signal", &enabled) == 0) {
-        enabled = 0;
-    }
-
-    if (enabled) {
-        SCLogInfo("Preparing unexpected signal handling");
-        struct sigaction stacktrace_action;
-        memset(&stacktrace_action, 0, sizeof(stacktrace_action));
-        stacktrace_action.sa_sigaction = SignalHandlerUnexpected;
-        stacktrace_action.sa_flags = SA_SIGINFO;
-        sigaction(SIGSEGV, &stacktrace_action, NULL);
-        sigaction(SIGABRT, &stacktrace_action, NULL);
-    }
-#endif /* HAVE_LIBUNWIND */
-#endif
 #ifndef OS_WIN32
     /* Try to get user/group to run suricata as if
        command line as not decide of that */