]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #4970: stream: remove lock on extra_data_log as it is only changed at...
authorMichael Matirko (mmatirko) <mmatirko@cisco.com>
Tue, 4 Nov 2025 09:43:22 +0000 (09:43 +0000)
committerOleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco) <oshumeik@cisco.com>
Tue, 4 Nov 2025 09:43:22 +0000 (09:43 +0000)
Merge in SNORT/snort3 from ~MMATIRKO/snort3:xtra_no_lock to master

Squashed commit of the following:

commit a59a788ca121a1df8bd111eec08b19e7437dad6b
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Mon Nov 3 09:49:45 2025 -0500

    stream: remove lock on extra_data_log as it is only changed at Analyzer startup

src/stream/stream.cc

index 0611241a72d59a364b358522183dbf6ac80f7311..e0dcea2e41144891f60b14f7ae74f870c232a6bb 100644 (file)
@@ -499,10 +499,9 @@ StreamSplitter* Stream::get_splitter(Flow* flow, bool to_server)
 void Stream::log_extra_data(
     Flow* flow, uint32_t mask, const AlertInfo& alert_info)
 {
-    std::lock_guard<std::mutex> xtra_lock(stream_xtra_mutex);
+    // coverity[missing_lock]
     if ( mask && stream.extra_data_log )
     {
-
         stream.extra_data_log(
             flow, stream.extra_data_context, stream.xtradata_map,
             stream.xtradata_func_count, mask, alert_info);