Skip to content

detect/integers: harmonize parser return handling (backport7) #11514

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
catenacyber wants to merge 1 commit into from
Closed

detect/integers: harmonize parser return handling (backport7) #11514

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions src/detect-bsize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,20 +157,6 @@ int DetectBsizeMatch(const SigMatchCtx *ctx, const uint64_t buffer_size, bool eo
return 0;
}

/**
* \brief This function is used to parse bsize options passed via bsize: keyword
*
* \param bsizestr Pointer to the user provided bsize options
*
* \retval bsized pointer to DetectU64Data on success
* \retval NULL on failure
*/

static DetectU64Data *DetectBsizeParse(const char *str)
{
return DetectU64Parse(str);
}

static int SigParseGetMaxBsize(DetectU64Data *bsz)
{
switch (bsz->mode) {
Expand Down Expand Up @@ -208,9 +194,9 @@ static int DetectBsizeSetup (DetectEngineCtx *de_ctx, Signature *s, const char *
if (list == DETECT_SM_LIST_NOTSET)
SCReturnInt(-1);

DetectU64Data *bsz = DetectBsizeParse(sizestr);
DetectU64Data *bsz = DetectU64Parse(sizestr);
if (bsz == NULL)
goto error;
SCReturnInt(-1);

sm = SigMatchAlloc();
if (sm == NULL)
Expand Down
9 changes: 3 additions & 6 deletions src/detect-dsize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,15 @@ static int DetectDsizeSetup (DetectEngineCtx *de_ctx, Signature *s, const char *
if (DetectGetLastSMFromLists(s, DETECT_DSIZE, -1)) {
SCLogError("Can't use 2 or more dsizes in "
"the same sig. Invalidating signature.");
goto error;
return -1;
}

SCLogDebug("\'%s\'", rawstr);

dd = DetectU16Parse(rawstr);
if (dd == NULL) {
SCLogError("Parsing \'%s\' failed", rawstr);
goto error;
return -1;
}

/* Okay so far so good, lets get this into a SigMatch
Expand All @@ -141,7 +141,7 @@ static int DetectDsizeSetup (DetectEngineCtx *de_ctx, Signature *s, const char *
if (sm == NULL){
SCLogError("Failed to allocate memory for SigMatch");
rs_detect_u16_free(dd);
goto error;
return -1;
}

sm->type = DETECT_DSIZE;
Expand All @@ -160,9 +160,6 @@ static int DetectDsizeSetup (DetectEngineCtx *de_ctx, Signature *s, const char *
}

return 0;

error:
return -1;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/detect-filesize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static int DetectFilesizeSetup (DetectEngineCtx *de_ctx, Signature *s, const cha

fsd = DetectU64Parse(str);
if (fsd == NULL)
goto error;
SCReturnInt(-1);

sm = SigMatchAlloc();
if (sm == NULL)
Expand Down
3 changes: 2 additions & 1 deletion src/detect-icode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ static int DetectICodeSetup(DetectEngineCtx *de_ctx, Signature *s, const char *i
SigMatch *sm = NULL;

icd = DetectU8Parse(icodestr);
if (icd == NULL) goto error;
if (icd == NULL)
return -1;

sm = SigMatchAlloc();
if (sm == NULL) goto error;
Expand Down
35 changes: 11 additions & 24 deletions src/detect-itype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,6 @@ static int DetectITypeMatch (DetectEngineThreadCtx *det_ctx, Packet *p,
return DetectU8Match(pitype, itd);
}

/**
* \brief This function is used to parse itype options passed via itype: keyword
*
* \param de_ctx Pointer to the detection engine context
* \param itypestr Pointer to the user provided itype options
*
* \retval itd pointer to DetectU8Data on success
* \retval NULL on failure
*/
static DetectU8Data *DetectITypeParse(DetectEngineCtx *de_ctx, const char *itypestr)
{
return DetectU8Parse(itypestr);
}

/**
* \brief this function is used to add the parsed itype data into the current signature
*
Expand All @@ -131,8 +117,9 @@ static int DetectITypeSetup(DetectEngineCtx *de_ctx, Signature *s, const char *i
DetectU8Data *itd = NULL;
SigMatch *sm = NULL;

itd = DetectITypeParse(de_ctx, itypestr);
if (itd == NULL) goto error;
itd = DetectU8Parse(itypestr);
if (itd == NULL)
return -1;

sm = SigMatchAlloc();
if (sm == NULL) goto error;
Expand Down Expand Up @@ -221,7 +208,7 @@ static bool PrefilterITypeIsPrefilterable(const Signature *s)
static int DetectITypeParseTest01(void)
{
DetectU8Data *itd = NULL;
itd = DetectITypeParse(NULL, "8");
itd = DetectU8Parse("8");
FAIL_IF_NULL(itd);
FAIL_IF_NOT(itd->arg1 == 8);
FAIL_IF_NOT(itd->mode == DETECT_UINT_EQ);
Expand All @@ -237,7 +224,7 @@ static int DetectITypeParseTest01(void)
static int DetectITypeParseTest02(void)
{
DetectU8Data *itd = NULL;
itd = DetectITypeParse(NULL, ">8");
itd = DetectU8Parse(">8");
FAIL_IF_NULL(itd);
FAIL_IF_NOT(itd->arg1 == 8);
FAIL_IF_NOT(itd->mode == DETECT_UINT_GT);
Expand All @@ -253,7 +240,7 @@ static int DetectITypeParseTest02(void)
static int DetectITypeParseTest03(void)
{
DetectU8Data *itd = NULL;
itd = DetectITypeParse(NULL, "<8");
itd = DetectU8Parse("<8");
FAIL_IF_NULL(itd);
FAIL_IF_NOT(itd->arg1 == 8);
FAIL_IF_NOT(itd->mode == DETECT_UINT_LT);
Expand All @@ -269,7 +256,7 @@ static int DetectITypeParseTest03(void)
static int DetectITypeParseTest04(void)
{
DetectU8Data *itd = NULL;
itd = DetectITypeParse(NULL, "8<>20");
itd = DetectU8Parse("8<>20");
FAIL_IF_NULL(itd);
FAIL_IF_NOT(itd->arg1 == 8);
FAIL_IF_NOT(itd->arg2 == 20);
Expand All @@ -286,7 +273,7 @@ static int DetectITypeParseTest04(void)
static int DetectITypeParseTest05(void)
{
DetectU8Data *itd = NULL;
itd = DetectITypeParse(NULL, " 8 ");
itd = DetectU8Parse(" 8 ");
FAIL_IF_NULL(itd);
FAIL_IF_NOT(itd->arg1 == 8);
FAIL_IF_NOT(itd->mode == DETECT_UINT_EQ);
Expand All @@ -302,7 +289,7 @@ static int DetectITypeParseTest05(void)
static int DetectITypeParseTest06(void)
{
DetectU8Data *itd = NULL;
itd = DetectITypeParse(NULL, " > 8 ");
itd = DetectU8Parse(" > 8 ");
FAIL_IF_NULL(itd);
FAIL_IF_NOT(itd->arg1 == 8);
FAIL_IF_NOT(itd->mode == DETECT_UINT_GT);
Expand All @@ -318,7 +305,7 @@ static int DetectITypeParseTest06(void)
static int DetectITypeParseTest07(void)
{
DetectU8Data *itd = NULL;
itd = DetectITypeParse(NULL, " 8 <> 20 ");
itd = DetectU8Parse(" 8 <> 20 ");
FAIL_IF_NULL(itd);
FAIL_IF_NOT(itd->arg1 == 8);
FAIL_IF_NOT(itd->arg2 == 20);
Expand All @@ -334,7 +321,7 @@ static int DetectITypeParseTest07(void)
static int DetectITypeParseTest08(void)
{
DetectU8Data *itd = NULL;
itd = DetectITypeParse(NULL, "> 8 <> 20");
itd = DetectU8Parse("> 8 <> 20");
FAIL_IF_NOT_NULL(itd);

PASS;
Expand Down
18 changes: 2 additions & 16 deletions src/detect-rfb-sectype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,6 @@ static int DetectRfbSectypeMatch (DetectEngineThreadCtx *det_ctx,
SCReturnInt(0);
}

/**
* \internal
* \brief Function to parse options passed via rfb.sectype keywords.
*
* \param rawstr Pointer to the user provided options.
*
* \retval dd pointer to DetectU32Data on success.
* \retval NULL on failure.
*/
static DetectU32Data *DetectRfbSectypeParse(const char *rawstr)
{
return DetectU32Parse(rawstr);
}

/**
* \brief Function to add the parsed RFB security type field into the current signature.
*
Expand All @@ -119,10 +105,10 @@ static int DetectRfbSectypeSetup (DetectEngineCtx *de_ctx, Signature *s, const c
if (DetectSignatureSetAppProto(s, ALPROTO_RFB) != 0)
return -1;

DetectU32Data *dd = DetectRfbSectypeParse(rawstr);
DetectU32Data *dd = DetectU32Parse(rawstr);
if (dd == NULL) {
SCLogError("Parsing \'%s\' failed", rawstr);
goto error;
return -1;
}

/* okay so far so good, lets get this into a SigMatch
Expand Down
4 changes: 2 additions & 2 deletions src/tests/detect-bsize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@

#define TEST_OK(str, m, lo, hi) \
{ \
DetectU64Data *bsz = DetectBsizeParse((str)); \
DetectU64Data *bsz = DetectU64Parse((str)); \
FAIL_IF_NULL(bsz); \
FAIL_IF_NOT(bsz->mode == (m)); \
DetectBsizeFree(NULL, bsz); \
SCLogDebug("str %s OK", (str)); \
}
#define TEST_FAIL(str) \
{ \
DetectU64Data *bsz = DetectBsizeParse((str)); \
DetectU64Data *bsz = DetectU64Parse((str)); \
FAIL_IF_NOT_NULL(bsz); \
}

Expand Down