Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dataset: cleanup datasets that hit the memcap while loading #10905

Merged
merged 1 commit into from
Apr 19, 2024
Merged

dataset: cleanup datasets that hit the memcap while loading #10905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/datasets.c
View file
Open in desktop
Expand Up @@ -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);

Expand Down
4 changes: 0 additions & 4 deletions src/detect-dataset.c
View file
Open in desktop
Expand Up @@ -407,10 +407,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))
Expand Down