From: Bhagya Tholpady (bbantwal) <bbantwal@cisco.com>
Date: Fri, 4 Sep 2020 01:44:30 +0000 (+0000)
Subject: Merge pull request #2450 in SNORT/snort3 from ~OKHOMIAK/snort3:jolt2_attack to master
X-Git-Tag: 3.0.2-6~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1001f9d71209e80c5a2c05f6145c8f6f66065ab8;p=thirdparty%2Fsnort3.git

Merge pull request #2450 in SNORT/snort3 from ~OKHOMIAK/snort3:jolt2_attack to master

Squashed commit of the following:

commit f57e74ffc9ec150810f7c7bf6c62c1cc5c393a5f
Author: Oleksii Khomiakovskyi <okhomiak@cisco.com>
Date:   Wed Sep 2 13:09:53 2020 +0300

    frag3: fix zero fragment built-in rule triggering for some reassembly policies
---

diff --git a/src/stream/ip/ip_defrag.cc b/src/stream/ip/ip_defrag.cc
index b704283b3..dd4dbe1cc 100644
--- a/src/stream/ip/ip_defrag.cc
+++ b/src/stream/ip/ip_defrag.cc
@@ -1603,6 +1603,8 @@ left_overlap_last:
 
                     ip_stats.discards++;
 
+                    EventAnomZeroFrag(fe);
+
                     return FRAG_INSERT_ANOMALY;
                 }
 
@@ -1871,7 +1873,7 @@ int Defrag::new_tracker(Packet* p, FragTracker* ft)
  */
 int Defrag::add_frag_node(
     FragTracker* ft,
-    FragEngine*,
+    FragEngine* fe,
     const uint8_t* fragStart,
     int16_t fragLength,
     char lastfrag,
@@ -1912,6 +1914,8 @@ int Defrag::add_frag_node(
         }
 #endif
 
+        EventAnomZeroFrag(fe);
+
         return FRAG_INSERT_ANOMALY;
     }