From: Oleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco) <oshumeik@cisco.com>
Date: Tue, 4 Oct 2022 17:41:54 +0000 (+0000)
Subject: Pull request #3611: actions: fix rewrite nullptr log crash
X-Git-Tag: 3.1.43.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdb31ab89d85a858459863d93473370c9bc6a091;p=thirdparty%2Fsnort3.git

Pull request #3611: actions: fix rewrite nullptr log crash

Merge in SNORT/snort3 from ~ASERBENI/snort3:act_crash to master

Squashed commit of the following:

commit 2d65237dbeb6cdd1239964fd856b036d3cabc9a7
Author: Andrii Serbeniuk <aserbeni@cisco.com>
Date:   Mon Oct 3 16:41:53 2022 +0300

    actions: fix action logging for suppressed events
---

diff --git a/src/actions/act_alert.cc b/src/actions/act_alert.cc
index fbc9fe705..9f95ea3e9 100644
--- a/src/actions/act_alert.cc
+++ b/src/actions/act_alert.cc
@@ -45,8 +45,7 @@ public:
 
 void AlertAction::exec(Packet* p, const OptTreeNode* otn)
 {
-    if ( otn )
-        Actions::alert(p, otn);
+    Actions::alert(p, otn);
 }
 
 //-------------------------------------------------------------------------
diff --git a/src/actions/act_block.cc b/src/actions/act_block.cc
index 6dce6fad2..2cf749a47 100644
--- a/src/actions/act_block.cc
+++ b/src/actions/act_block.cc
@@ -49,8 +49,8 @@ void BlockAction::exec(Packet* p, const OptTreeNode* otn)
 {
     p->active->block_session(p);
     p->active->set_drop_reason("ips");
-    if ( otn )
-        Actions::alert(p, otn);
+
+    Actions::alert(p, otn);
 }
 
 //-------------------------------------------------------------------------
diff --git a/src/actions/act_drop.cc b/src/actions/act_drop.cc
index 0df4ac691..e65f9eab3 100644
--- a/src/actions/act_drop.cc
+++ b/src/actions/act_drop.cc
@@ -49,8 +49,8 @@ void DropAction::exec(Packet* p, const OptTreeNode* otn)
 {
     p->active->drop_packet(p);
     p->active->set_drop_reason("ips");
-    if ( otn )
-        Actions::alert(p, otn);
+
+    Actions::alert(p, otn);
 }
 
 //-------------------------------------------------------------------------
diff --git a/src/actions/act_react.cc b/src/actions/act_react.cc
index 4ea94e633..cdb80f20f 100644
--- a/src/actions/act_react.cc
+++ b/src/actions/act_react.cc
@@ -209,8 +209,8 @@ void ReactAction::exec(Packet* p, const OptTreeNode* otn)
 {
     p->active->drop_packet(p);
     p->active->set_drop_reason("ips");
-    if ( otn )
-        Actions::alert(p, otn);
+
+    Actions::alert(p, otn);
 }
 
 //-------------------------------------------------------------------------
diff --git a/src/actions/act_reject.cc b/src/actions/act_reject.cc
index 6e1f78873..a07c1d55d 100644
--- a/src/actions/act_reject.cc
+++ b/src/actions/act_reject.cc
@@ -175,8 +175,7 @@ void RejectAction::exec(Packet* p, const OptTreeNode* otn)
     p->active->reset_again();
     p->active->update_status(p);
 
-    if ( otn )
-        Actions::alert(p, otn);
+    Actions::alert(p, otn);
 }
 
 //-------------------------------------------------------------------------
diff --git a/src/actions/actions.cc b/src/actions/actions.cc
index 87b74e583..7fc35408c 100644
--- a/src/actions/actions.cc
+++ b/src/actions/actions.cc
@@ -45,6 +45,9 @@ void Actions::log(Packet* p, const OptTreeNode* otn)
 
 void Actions::alert(Packet* p, const OptTreeNode* otn)
 {
+    if (!otn)
+        return;
+
     RuleTreeNode* rtn = getRtnFromOtn(otn);
     assert(rtn);