Skip to content

detect/parse: guard HashListTableLookup results in duplicate sig check #15557

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

Closed
kenifor wants to merge 1 commit into from
Closed

detect/parse: guard HashListTableLookup results in duplicate sig check #15557

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/detect-parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3390,7 +3390,12 @@ static inline int DetectEngineSignatureIsDuplicate(DetectEngineCtx *de_ctx,
sw_tmp.s = de_ctx->sig_list;
sw_old = HashListTableLookup(de_ctx->dup_sig_hash_table,
(void *)&sw_tmp, 0);
/* sw_old == NULL case is impossible */
/* sw_old == NULL case is impossible: every sig in sig_list
* must have a corresponding dup_sig_hash_table entry */
DEBUG_VALIDATE_BUG_ON(sw_old == NULL);
if (unlikely(sw_old == NULL)) {
goto end;
}
sw_old->s_prev = sig;
}

Expand Down Expand Up @@ -3425,7 +3430,10 @@ static inline int DetectEngineSignatureIsDuplicate(DetectEngineCtx *de_ctx,
if (sw_temp.s != NULL) {
sw_next = HashListTableLookup(de_ctx->dup_sig_hash_table,
(void *)&sw_temp, 0);
sw_next->s_prev = sw_dup->s_prev;
DEBUG_VALIDATE_BUG_ON(sw_next == NULL);
if (likely(sw_next != NULL)) {
sw_next->s_prev = sw_dup->s_prev;
}
}
SigFree(de_ctx, sw_dup->s);
} else {
Expand Down Expand Up @@ -3455,7 +3463,10 @@ static inline int DetectEngineSignatureIsDuplicate(DetectEngineCtx *de_ctx,
if (sw_temp.s != NULL) {
sw_next = HashListTableLookup(de_ctx->dup_sig_hash_table,
(void *)&sw_temp, 0);
sw_next->s_prev = sw_dup->s_prev;
DEBUG_VALIDATE_BUG_ON(sw_next == NULL);
if (likely(sw_next != NULL)) {
sw_next->s_prev = sw_dup->s_prev;
}
}
SigFree(de_ctx, sw_dup->s);
}
Expand All @@ -3470,7 +3481,8 @@ static inline int DetectEngineSignatureIsDuplicate(DetectEngineCtx *de_ctx,
sw_tmp.s = de_ctx->sig_list;
SigDuplWrapper *sw_old = HashListTableLookup(de_ctx->dup_sig_hash_table,
(void *)&sw_tmp, 0);
if (sw_old->s != sw_dup->s) {
DEBUG_VALIDATE_BUG_ON(sw_old == NULL);
if (likely(sw_old != NULL) && sw_old->s != sw_dup->s) {
// Link on top of the list if there was another element
sw_old->s_prev = sig;
}
Expand Down