From: Victor Julien <victor@inliniac.net>
Date: Thu, 9 Aug 2018 15:35:32 +0000 (+0200)
Subject: detect/prefilter: fix prefilter when setting is 'mpm'
X-Git-Tag: suricata-4.1.0-rc2~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f1befd217d7ba30424be91306b6563a34f79ba6;p=thirdparty%2Fsuricata.git

detect/prefilter: fix prefilter when setting is 'mpm'

When prefilter is not enabled globally, it is still possible to
enable it per signature. This was broken however, as the setup
code would never be called.

This commit always call the setup code and lets that sort out
which signatures (if any) to enable prefiltering for.
---

diff --git a/src/detect-engine-prefilter.c b/src/detect-engine-prefilter.c
index f9075ba8d4..e0b04159b7 100644
--- a/src/detect-engine-prefilter.c
+++ b/src/detect-engine-prefilter.c
@@ -348,13 +348,12 @@ void PrefilterSetupRuleGroup(DetectEngineCtx *de_ctx, SigGroupHead *sgh)
 {
     BUG_ON(PatternMatchPrepareGroup(de_ctx, sgh) != 0);
 
-    if (de_ctx->prefilter_setting == DETECT_PREFILTER_AUTO) {
-        int i = 0;
-        for (i = 0; i < DETECT_TBLSIZE; i++)
-        {
-            if (sigmatch_table[i].SetupPrefilter != NULL) {
-                sigmatch_table[i].SetupPrefilter(de_ctx, sgh);
-            }
+    /* set up engines if needed - independent of 'detect.prefilter.default'
+     * setting as the prefilter keyword may have enabled individual sigs */
+    for (int i = 0; i < DETECT_TBLSIZE; i++)
+    {
+        if (sigmatch_table[i].SetupPrefilter != NULL) {
+            sigmatch_table[i].SetupPrefilter(de_ctx, sgh);
         }
     }