aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: check retval of VarNameStoreRegister

Browse Source 
VarNameStoreRegister can return 0 in case of any error conditions.
Handle this case in all the users of this function. It is an unlikely
event so add branch assistance accordingly.

Bug 8054
pull/14262/head
Shivani Bhardwaj 9 months ago committed by Victor Julien
parent 6b3c21a4e6
commit bb1ed16408
8 changed files with 64 additions and 17 deletions
Show Stats Download Patch File Download Diff File

13
src/detect-flowbits.c
Unescape Escape View File

@ -134,7 +134,10 @@ static int FlowbitOrAddData(DetectEngineCtx *de_ctx, DetectFlowbitsData *cd, cha
if (unlikely(cd->or_list == NULL)) if (unlikely(cd->or_list == NULL))
return -1; return -1;
for (uint8_t j = 0; j < cd->or_list_size ; j++) { for (uint8_t j = 0; j < cd->or_list_size ; j++) {
cd->or_list[j] = VarNameStoreRegister(strarr[j], VAR_TYPE_FLOW_BIT); uint32_t varname_id = VarNameStoreRegister(strarr[j], VAR_TYPE_FLOW_BIT);
if (unlikely(varname_id == 0))
return -1;
cd->or_list[j] = varname_id;
de_ctx->max_fb_id = MAX(cd->or_list[j], de_ctx->max_fb_id); de_ctx->max_fb_id = MAX(cd->or_list[j], de_ctx->max_fb_id);
} }
@ -349,7 +352,10 @@ int DetectFlowbitSetup (DetectEngineCtx *de_ctx, Signature *s, const char *rawst
} }
cd->cmd = fb_cmd; cd->cmd = fb_cmd;
} else { } else {
cd->idx = VarNameStoreRegister(fb_name, VAR_TYPE_FLOW_BIT); uint32_t varname_id = VarNameStoreRegister(fb_name, VAR_TYPE_FLOW_BIT);
if (unlikely(varname_id == 0))
goto error;
cd->idx = varname_id;
de_ctx->max_fb_id = MAX(cd->idx, de_ctx->max_fb_id); de_ctx->max_fb_id = MAX(cd->idx, de_ctx->max_fb_id);
cd->cmd = fb_cmd; cd->cmd = fb_cmd;
cd->or_list_size = 0; cd->or_list_size = 0;
@ -1610,6 +1616,7 @@ static int FlowBitsTestSig06(void)
FAIL_IF_NULL(s); FAIL_IF_NULL(s);
idx = VarNameStoreRegister("myflow", VAR_TYPE_FLOW_BIT); idx = VarNameStoreRegister("myflow", VAR_TYPE_FLOW_BIT);
FAIL_IF_NOT(idx);
SigGroupBuild(de_ctx); SigGroupBuild(de_ctx);
DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx); DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);
@ -1684,6 +1691,7 @@ static int FlowBitsTestSig07(void)
FAIL_IF_NULL(s); FAIL_IF_NULL(s);
idx = VarNameStoreRegister("myflow", VAR_TYPE_FLOW_BIT); idx = VarNameStoreRegister("myflow", VAR_TYPE_FLOW_BIT);
FAIL_IF_NOT(idx);
SigGroupBuild(de_ctx); SigGroupBuild(de_ctx);
DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx); DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);
@ -1759,6 +1767,7 @@ static int FlowBitsTestSig08(void)
FAIL_IF_NULL(s); FAIL_IF_NULL(s);
idx = VarNameStoreRegister("myflow", VAR_TYPE_FLOW_BIT); idx = VarNameStoreRegister("myflow", VAR_TYPE_FLOW_BIT);
FAIL_IF_NOT(idx);
SigGroupBuild(de_ctx); SigGroupBuild(de_ctx);
DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx); DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);

5
src/detect-flowint.c
Unescape Escape View File

@ -334,7 +334,10 @@ static DetectFlowintData *DetectFlowintParse(DetectEngineCtx *de_ctx, const char
SCLogError("malloc from strdup failed"); SCLogError("malloc from strdup failed");
goto error; goto error;
} }
sfd->idx = VarNameStoreRegister(varname, VAR_TYPE_FLOW_INT); uint32_t varname_id = VarNameStoreRegister(varname, VAR_TYPE_FLOW_INT);
if (unlikely(varname_id == 0))
goto error;
sfd->idx = varname_id;
SCLogDebug("sfd->name %s id %u", sfd->name, sfd->idx); SCLogDebug("sfd->name %s id %u", sfd->name, sfd->idx);
sfd->modifier = modifier; sfd->modifier = modifier;

7
src/detect-flowvar.c
Unescape Escape View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007-2020 Open Information Security Foundation /* Copyright (C) 2007-2025 Open Information Security Foundation
* *
* You can copy, redistribute or modify this Program under the terms of * You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free * the GNU General Public License version 2 as published by the Free
@ -178,7 +178,10 @@ static int DetectFlowvarSetup (DetectEngineCtx *de_ctx, Signature *s, const char
fd->name = SCStrdup(varname); fd->name = SCStrdup(varname);
if (unlikely(fd->name == NULL)) if (unlikely(fd->name == NULL))
goto error; goto error;
fd->idx = VarNameStoreRegister(varname, VAR_TYPE_FLOW_VAR); uint32_t varname_id = VarNameStoreRegister(varname, VAR_TYPE_FLOW_VAR);
if (unlikely(varname_id == 0))
goto error;
fd->idx = varname_id;
/* Okay so far so good, lets get this into a SigMatch /* Okay so far so good, lets get this into a SigMatch
* and put it in the Signature. */ * and put it in the Signature. */

5
src/detect-hostbits.c
Unescape Escape View File

@ -395,7 +395,10 @@ int DetectHostbitSetup (DetectEngineCtx *de_ctx, Signature *s, const char *rawst
if (unlikely(cd == NULL)) if (unlikely(cd == NULL))
goto error; goto error;
cd->idx = VarNameStoreRegister(fb_name, VAR_TYPE_HOST_BIT); uint32_t varname_id = VarNameStoreRegister(fb_name, VAR_TYPE_HOST_BIT);
if (unlikely(varname_id == 0))
goto error;
cd->idx = varname_id;
cd->cmd = fb_cmd; cd->cmd = fb_cmd;
cd->tracker = hb_dir; cd->tracker = hb_dir;
cd->type = VAR_TYPE_HOST_BIT; cd->type = VAR_TYPE_HOST_BIT;

6
src/detect-lua.c
Unescape Escape View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007-2024 Open Information Security Foundation /* Copyright (C) 2007-2025 Open Information Security Foundation
* *
* You can copy, redistribute or modify this Program under the terms of * You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free * the GNU General Public License version 2 as published by the Free
@ -575,6 +575,8 @@ static int DetectLuaSetupPrime(DetectEngineCtx *de_ctx, DetectLuaData *ld, const
} }
uint32_t idx = VarNameStoreRegister(value, VAR_TYPE_FLOW_VAR); uint32_t idx = VarNameStoreRegister(value, VAR_TYPE_FLOW_VAR);
if (unlikely(idx == 0))
goto error;
ld->flowvar[ld->flowvars++] = idx; ld->flowvar[ld->flowvars++] = idx;
SCLogDebug("script uses flowvar %u with script id %u", idx, ld->flowvars - 1); SCLogDebug("script uses flowvar %u with script id %u", idx, ld->flowvars - 1);
} }
@ -597,6 +599,8 @@ static int DetectLuaSetupPrime(DetectEngineCtx *de_ctx, DetectLuaData *ld, const
} }
uint32_t idx = VarNameStoreRegister(value, VAR_TYPE_FLOW_INT); uint32_t idx = VarNameStoreRegister(value, VAR_TYPE_FLOW_INT);
if (unlikely(idx == 0))
goto error;
ld->flowint[ld->flowints++] = idx; ld->flowint[ld->flowints++] = idx;
SCLogDebug("script uses flowint %u with script id %u", idx, ld->flowints - 1); SCLogDebug("script uses flowint %u with script id %u", idx, ld->flowints - 1);
} }

30
src/detect-pcre.c
Unescape Escape View File

@ -815,21 +815,30 @@ static int DetectPcreParseCapture(const char *regexstr, DetectEngineCtx *de_ctx,
return -1; return -1;
} else if (strncmp(name_array[name_idx], "flow:", 5) == 0) { } else if (strncmp(name_array[name_idx], "flow:", 5) == 0) {
pd->capids[pd->idx] = uint32_t varname_id =
VarNameStoreRegister(name_array[name_idx] + 5, VAR_TYPE_FLOW_VAR); VarNameStoreRegister(name_array[name_idx] + 5, VAR_TYPE_FLOW_VAR);
if (unlikely(varname_id == 0))
return -1;
pd->capids[pd->idx] = varname_id;
pd->captypes[pd->idx] = VAR_TYPE_FLOW_VAR; pd->captypes[pd->idx] = VAR_TYPE_FLOW_VAR;
pd->idx++; pd->idx++;
} else if (strncmp(name_array[name_idx], "pkt:", 4) == 0) { } else if (strncmp(name_array[name_idx], "pkt:", 4) == 0) {
pd->capids[pd->idx] = uint32_t varname_id =
VarNameStoreRegister(name_array[name_idx] + 4, VAR_TYPE_PKT_VAR); VarNameStoreRegister(name_array[name_idx] + 4, VAR_TYPE_PKT_VAR);
if (unlikely(varname_id == 0))
return -1;
pd->capids[pd->idx] = varname_id;
pd->captypes[pd->idx] = VAR_TYPE_PKT_VAR; pd->captypes[pd->idx] = VAR_TYPE_PKT_VAR;
SCLogDebug("id %u type %u", pd->capids[pd->idx], pd->captypes[pd->idx]); SCLogDebug("id %u type %u", pd->capids[pd->idx], pd->captypes[pd->idx]);
pd->idx++; pd->idx++;
} else if (strncmp(name_array[name_idx], "alert:", 6) == 0) { } else if (strncmp(name_array[name_idx], "alert:", 6) == 0) {
pd->capids[pd->idx] = uint32_t varname_id =
VarNameStoreRegister(name_array[name_idx] + 6, VAR_TYPE_ALERT_VAR); VarNameStoreRegister(name_array[name_idx] + 6, VAR_TYPE_ALERT_VAR);
if (unlikely(varname_id == 0))
return -1;
pd->capids[pd->idx] = varname_id;
pd->captypes[pd->idx] = VAR_TYPE_ALERT_VAR; pd->captypes[pd->idx] = VAR_TYPE_ALERT_VAR;
pd->idx++; pd->idx++;
@ -890,16 +899,25 @@ static int DetectPcreParseCapture(const char *regexstr, DetectEngineCtx *de_ctx,
} }
if (strcmp(type_str, "pkt") == 0) { if (strcmp(type_str, "pkt") == 0) {
pd->capids[pd->idx] = VarNameStoreRegister((char *)capture_str, VAR_TYPE_PKT_VAR); uint32_t varname_id = VarNameStoreRegister((char *)capture_str, VAR_TYPE_PKT_VAR);
if (unlikely(varname_id == 0))
return -1;
pd->capids[pd->idx] = varname_id;
pd->captypes[pd->idx] = VAR_TYPE_PKT_VAR; pd->captypes[pd->idx] = VAR_TYPE_PKT_VAR;
SCLogDebug("id %u type %u", pd->capids[pd->idx], pd->captypes[pd->idx]); SCLogDebug("id %u type %u", pd->capids[pd->idx], pd->captypes[pd->idx]);
pd->idx++; pd->idx++;
} else if (strcmp(type_str, "flow") == 0) { } else if (strcmp(type_str, "flow") == 0) {
pd->capids[pd->idx] = VarNameStoreRegister((char *)capture_str, VAR_TYPE_FLOW_VAR); uint32_t varname_id = VarNameStoreRegister((char *)capture_str, VAR_TYPE_FLOW_VAR);
if (unlikely(varname_id == 0))
return -1;
pd->capids[pd->idx] = varname_id;
pd->captypes[pd->idx] = VAR_TYPE_FLOW_VAR; pd->captypes[pd->idx] = VAR_TYPE_FLOW_VAR;
pd->idx++; pd->idx++;
} else if (strcmp(type_str, "alert") == 0) { } else if (strcmp(type_str, "alert") == 0) {
pd->capids[pd->idx] = VarNameStoreRegister((char *)capture_str, VAR_TYPE_ALERT_VAR); uint32_t varname_id = VarNameStoreRegister((char *)capture_str, VAR_TYPE_ALERT_VAR);
if (unlikely(varname_id == 0))
return -1;
pd->capids[pd->idx] = varname_id;
pd->captypes[pd->idx] = VAR_TYPE_ALERT_VAR; pd->captypes[pd->idx] = VAR_TYPE_ALERT_VAR;
pd->idx++; pd->idx++;
} }

10
src/detect-pktvar.c
Unescape Escape View File

@ -94,7 +94,7 @@ static int DetectPktvarSetup (DetectEngineCtx *de_ctx, Signature *s, const char
size_t pcre2_len; size_t pcre2_len;
uint8_t *content = NULL; uint8_t *content = NULL;
uint16_t len = 0; uint16_t len = 0;
DetectPktvarData *cd = NULL;
pcre2_match_data *match = NULL; pcre2_match_data *match = NULL;
int ret = DetectParsePcreExec(&parse_regex, &match, rawstr, 0, 0); int ret = DetectParsePcreExec(&parse_regex, &match, rawstr, 0, 0);
if (ret != 3) { if (ret != 3) {
@ -138,7 +138,7 @@ static int DetectPktvarSetup (DetectEngineCtx *de_ctx, Signature *s, const char
} }
pcre2_substring_free((PCRE2_UCHAR8 *)varcontent); pcre2_substring_free((PCRE2_UCHAR8 *)varcontent);
DetectPktvarData *cd = SCCalloc(1, sizeof(DetectPktvarData)); cd = SCCalloc(1, sizeof(DetectPktvarData));
if (unlikely(cd == NULL)) { if (unlikely(cd == NULL)) {
pcre2_substring_free((PCRE2_UCHAR8 *)varname); pcre2_substring_free((PCRE2_UCHAR8 *)varname);
SCFree(content); SCFree(content);
@ -147,7 +147,10 @@ static int DetectPktvarSetup (DetectEngineCtx *de_ctx, Signature *s, const char
cd->content = content; cd->content = content;
cd->content_len = len; cd->content_len = len;
cd->id = VarNameStoreRegister(varname, VAR_TYPE_PKT_VAR); uint32_t varname_id = VarNameStoreRegister(varname, VAR_TYPE_PKT_VAR);
if (unlikely(varname_id == 0))
goto error;
cd->id = varname_id;
pcre2_substring_free((PCRE2_UCHAR8 *)varname); pcre2_substring_free((PCRE2_UCHAR8 *)varname);
/* Okay so far so good, lets get this into a SigMatch /* Okay so far so good, lets get this into a SigMatch
@ -161,6 +164,7 @@ static int DetectPktvarSetup (DetectEngineCtx *de_ctx, Signature *s, const char
return 0; return 0;
error: error:
DetectPktvarFree(de_ctx, cd);
if (match) { if (match) {
pcre2_match_data_free(match); pcre2_match_data_free(match);
} }

5
src/detect-xbits.c
Unescape Escape View File

@ -368,7 +368,10 @@ static int DetectXbitParse(DetectEngineCtx *de_ctx,
if (unlikely(cd == NULL)) if (unlikely(cd == NULL))
return -1; return -1;
cd->idx = VarNameStoreRegister(fb_name, var_type); uint32_t varname_id = VarNameStoreRegister(fb_name, var_type);
if (unlikely(varname_id == 0))
goto error;
cd->idx = varname_id;
cd->cmd = fb_cmd; cd->cmd = fb_cmd;
cd->tracker = hb_dir; cd->tracker = hb_dir;
cd->type = var_type; cd->type = var_type;

Write Preview
Loading…
Cancel
Save