From: Andreas Herz <andi@geekosphere.org>
Date: Wed, 13 Dec 2017 23:59:30 +0000 (+0100)
Subject: rule-reload: fix possible hangup with SIGUSR2
X-Git-Tag: suricata-4.1.0-beta1~457
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77e548ed1c3cfaa384b498e054e52d054e0e2b40;p=thirdparty%2Fsuricata.git

rule-reload: fix possible hangup with SIGUSR2

In some cases the rule reload could hang. The pending USR2 signals will
be recognized even with the <2 check. Also the SCLogWarning shouldn't be
used in the handler (see Warning about SCLog* API above in the code).
---

diff --git a/src/suricata.c b/src/suricata.c
index 2e30bc03f0..50690df9c7 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -293,11 +293,8 @@ static void SignalHandlerSigterm(/*@unused@*/ int sig)
  */
 static void SignalHandlerSigusr2(int sig)
 {
-    if (sigusr2_count < 16) {
+    if (sigusr2_count < 2)
         sigusr2_count++;
-    } else {
-        SCLogWarning(SC_ERR_LIVE_RULE_SWAP, "Too many USR2 signals pending, ignoring new ones!");
-    }
 }
 
 /**