From: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date: Thu, 23 Jun 2022 15:14:09 +0000 (+0000)
Subject: Pull request #3480: Fix SEGFAULT in suppress module
X-Git-Tag: 3.1.33.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc74460fe7ff1371be84712cb87a224be30bb140;p=thirdparty%2Fsnort3.git

Pull request #3480: Fix SEGFAULT in suppress module

Merge in SNORT/snort3 from ~VHORBAN/snort3:fix_segfauld_in_suppress_module to master

Squashed commit of the following:

commit a28a35b361421fc8287c1cd896545076a35216c6
Author: Volodymyr Horban <vhorban@cisco.com>
Date:   Fri Jun 17 14:46:03 2022 +0300

    filters: check if a configured gid value is supported by filter's implementation
---

diff --git a/src/filters/sfthd.cc b/src/filters/sfthd.cc
index 6e9191cdb..00ce082f4 100644
--- a/src/filters/sfthd.cc
+++ b/src/filters/sfthd.cc
@@ -470,6 +470,9 @@ static int sfthd_create_threshold_global(
     if (thd_objs == nullptr)
         return -1;
 
+    if (config->gen_id >= THD_MAX_GENID)
+        return -1;
+
     if (thd_objs->sfthd_garray[policy_id] == nullptr)
     {
         thd_objs->sfthd_garray[policy_id] =
diff --git a/src/main/modules.cc b/src/main/modules.cc
index 91d86f838..2a10a8182 100644
--- a/src/main/modules.cc
+++ b/src/main/modules.cc
@@ -1551,19 +1551,19 @@ bool SuppressModule::end(const char*, int idx, SnortConfig* sc)
 
     if ( thdx.gen_id == 0 and thdx.sig_id >= 1 )
     {
-        ParseError("bad or incomplete gid:sid pair [%d]", idx);
+        ParseError("bad or incomplete gid:sid pair");
         return false;
     }
 
     if ( ( thdx.tracking == 0 and thdx.ip_address ) or ( thdx.tracking > 0 and !thdx.ip_address ) )
     {
-        ParseError("incomplete pair of track and IP [%d]", idx);
+        ParseError("incomplete pair of track and IP");
         return false;
     }
 
     if ( sfthreshold_create(sc, sc->threshold_config, &thdx, get_network_policy()->policy_id) )
     {
-        ParseError("threshold object cannot be created from the given parameters [%d]", idx);
+        ParseError("threshold object cannot be created from the given parameters");
         return false;
     }