Merge pull request #2124 in SNORT/snort3 from ~APOORAJ/snort3:race_condition_ftp...

Squashed commit of the following:

commit af8985bba3de4f461d1471cc2bfac4c586cce0fe
Author: Apoorv Raj <apooraj@cisco.com>
Date:   Mon Mar 30 15:15:35 2020 -0400

    ftp_data: fix race condition

diff --git a/src/service_inspectors/ftp_telnet/ftp_data.cc b/src/service_inspectors/ftp_telnet/ftp_data.cc
index a75d8a0f5a65b020ce3dbf339c0ae3ff6a88ff7e..ccd2731c96812539061b6c0f4d705f18c3e9bc23 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_data.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_data.cc
@@ -104,7 +104,7 @@ static void FTPDataProcess(
     if ( !status )
     {
         IpsPolicy* empty_policy = snort::get_empty_ips_policy(SnortConfig::get_conf());
-        if ( !get_rule_count() || (empty_policy->policy_id == p->flow->ips_policy_id) )
+        if ( empty_policy->policy_id == p->flow->ips_policy_id )
         {
             if ( PacketTracer::is_active() )
                 PacketTracer::log("Whitelisting Flow: FTP data\n");