dataset: cleanup datasets that hit the memcap while loading

Datasets that hit the memcap limit need to be discarded if the memcap is
hit or otherwise the datasets are still loaded with partial data while
the signature is not loaded due to the memcap error.

Ticket: #6678

diff --git a/src/datasets.c b/src/datasets.c
index d89ed8df59daa686dbdb8a1ae1e1a9b0b7c577ff..01ef5bb47c90a337139d97c593227f2ebfadf3cb 100644 (file)
--- a/src/datasets.c
+++ b/src/datasets.c
@@ -746,6 +746,11 @@ Dataset *DatasetGet(const char *name, enum DatasetTypes type, const char *save,
             break;
     }
 
+    if (set->hash && SC_ATOMIC_GET(set->hash->memcap_reached)) {
+        SCLogError("dataset too large for set memcap");
+        goto out_err;
+    }
+
     SCLogDebug("set %p/%s type %u save %s load %s",
             set, set->name, set->type, set->save, set->load);
 

diff --git a/src/detect-dataset.c b/src/detect-dataset.c
index f6d0d844e2e515a2e8fc3708237f306d9a21ad65..70e9e67c946dae4320fe826284cbdb6f3e8912ba 100644 (file)
--- a/src/detect-dataset.c
+++ b/src/detect-dataset.c
@@ -406,10 +406,6 @@ int DetectDatasetSetup (DetectEngineCtx *de_ctx, Signature *s, const char *rawst
         SCLogError("failed to set up dataset '%s'.", name);
         return -1;
     }
-    if (set->hash && SC_ATOMIC_GET(set->hash->memcap_reached)) {
-        SCLogError("dataset too large for set memcap");
-        return -1;
-    }
 
     cd = SCCalloc(1, sizeof(DetectDatasetData));
     if (unlikely(cd == NULL))