github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

scratch: add quick validity check

Browse Source 
fix github issue #350
This commit is contained in:
Hong, Yang A 2022-10-20 08:48:46 +00:00 committed by Konstantinos Margaritis
parent 659525480c
commit 7f2f7d2a1e
5 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/runtime.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2019, Intel Corporation * Copyright (c) 2015-2022, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -90,7 +90,7 @@ u8 *getHistory(char *state, const struct RoseEngine *t, u64a offset) {
* callers. * callers.
*/ */
static really_inline static really_inline
char validScratch(const struct RoseEngine *t, const struct hs_scratch *s) { char validScratch(const struct hs_scratch *s, u32 crc) {
if (!ISALIGNED_CL(s)) { if (!ISALIGNED_CL(s)) {
DEBUG_PRINTF("bad alignment %p\n", s); DEBUG_PRINTF("bad alignment %p\n", s);
return 0; return 0;
@ -101,18 +101,12 @@ char validScratch(const struct RoseEngine *t, const struct hs_scratch *s) {
return 0; return 0;
} }
if (t->mode == HS_MODE_BLOCK && t->stateOffsets.end > s->bStateSize) { /* add quick rose sanity checks by db crc*/
DEBUG_PRINTF("bad state size\n"); if (s->db_crc != crc) {
DEBUG_PRINTF("Improper scratch for current db\n");
return 0; return 0;
} }
if (t->queueCount > s->queueCount) {
DEBUG_PRINTF("bad queue count\n");
return 0;
}
/* TODO: add quick rose sanity checks */
return 1; return 1;
} }
@ -335,7 +329,7 @@ hs_error_t HS_CDECL hs_scan(const hs_database_t *db, const char *data,
return HS_DB_MODE_ERROR; return HS_DB_MODE_ERROR;
} }
if (unlikely(!validScratch(rose, scratch))) { if (unlikely(!validScratch(scratch, db->crc32))) {
return HS_INVALID; return HS_INVALID;
} }
@ -509,7 +503,7 @@ void maintainHistoryBuffer(const struct RoseEngine *rose, char *state,
static really_inline static really_inline
void init_stream(struct hs_stream *s, const struct RoseEngine *rose, void init_stream(struct hs_stream *s, const struct RoseEngine *rose,
char init_history) { char init_history, u32 crc) {
char *state = getMultiState(s); char *state = getMultiState(s);
if (init_history) { if (init_history) {
@ -524,6 +518,7 @@ void init_stream(struct hs_stream *s, const struct RoseEngine *rose,
s->rose = rose; s->rose = rose;
s->offset = 0; s->offset = 0;
s->crc32 = crc;
setStreamStatus(state, 0); setStreamStatus(state, 0);
roseInitState(rose, state); roseInitState(rose, state);
@ -568,7 +563,7 @@ hs_error_t HS_CDECL hs_open_stream(const hs_database_t *db,
return HS_NOMEM; return HS_NOMEM;
} }
init_stream(s, rose, 1); init_stream(s, rose, 1, db->crc32);
*stream = s; *stream = s;
return HS_SUCCESS; return HS_SUCCESS;
@ -756,7 +751,7 @@ hs_error_t HS_CDECL hs_reset_and_copy_stream(hs_stream_t *to_id,
} }
if (onEvent) { if (onEvent) {
if (!scratch || !validScratch(to_id->rose, scratch)) { if (!scratch || !validScratch(scratch, to_id->crc32)) {
return HS_INVALID; return HS_INVALID;
} }
if (unlikely(markScratchInUse(scratch))) { if (unlikely(markScratchInUse(scratch))) {
@ -982,7 +977,7 @@ hs_error_t HS_CDECL hs_scan_stream(hs_stream_t *id, const char *data,
hs_scratch_t *scratch, hs_scratch_t *scratch,
match_event_handler onEvent, void *context) { match_event_handler onEvent, void *context) {
if (unlikely(!id || !scratch || !data || if (unlikely(!id || !scratch || !data ||
!validScratch(id->rose, scratch))) { !validScratch(scratch, id->crc32))) {
return HS_INVALID; return HS_INVALID;
} }
@ -1004,7 +999,7 @@ hs_error_t HS_CDECL hs_close_stream(hs_stream_t *id, hs_scratch_t *scratch,
} }
if (onEvent) { if (onEvent) {
if (!scratch || !validScratch(id->rose, scratch)) { if (!scratch || !validScratch(scratch, id->crc32)) {
return HS_INVALID; return HS_INVALID;
} }
if (unlikely(markScratchInUse(scratch))) { if (unlikely(markScratchInUse(scratch))) {
@ -1034,7 +1029,7 @@ hs_error_t HS_CDECL hs_reset_stream(hs_stream_t *id, UNUSED unsigned int flags,
} }
if (onEvent) { if (onEvent) {
if (!scratch || !validScratch(id->rose, scratch)) { if (!scratch || !validScratch(scratch, id->crc32)) {
return HS_INVALID; return HS_INVALID;
} }
if (unlikely(markScratchInUse(scratch))) { if (unlikely(markScratchInUse(scratch))) {
@ -1049,7 +1044,7 @@ hs_error_t HS_CDECL hs_reset_stream(hs_stream_t *id, UNUSED unsigned int flags,
} }
// history already initialised // history already initialised
init_stream(id, id->rose, 0); init_stream(id, id->rose, 0, id->crc32);
return HS_SUCCESS; return HS_SUCCESS;
} }
@ -1128,7 +1123,7 @@ hs_error_t HS_CDECL hs_scan_vector(const hs_database_t *db,
return HS_DB_MODE_ERROR; return HS_DB_MODE_ERROR;
} }
if (unlikely(!validScratch(rose, scratch))) { if (unlikely(!validScratch(scratch, db->crc32))) {
return HS_INVALID; return HS_INVALID;
} }
@ -1138,7 +1133,7 @@ hs_error_t HS_CDECL hs_scan_vector(const hs_database_t *db,
hs_stream_t *id = (hs_stream_t *)(scratch->bstate); hs_stream_t *id = (hs_stream_t *)(scratch->bstate);
init_stream(id, rose, 1); /* open stream */ init_stream(id, rose, 1, db->crc32); /* open stream */
for (u32 i = 0; i < count; i++) { for (u32 i = 0; i < count; i++) {
DEBUG_PRINTF("block %u/%u offset=%llu len=%u\n", i, count, id->offset, DEBUG_PRINTF("block %u/%u offset=%llu len=%u\n", i, count, id->offset,
@ -1253,7 +1248,7 @@ hs_error_t HS_CDECL hs_reset_and_expand_stream(hs_stream_t *to_stream,
const struct RoseEngine *rose = to_stream->rose; const struct RoseEngine *rose = to_stream->rose;
if (onEvent) { if (onEvent) {
if (!scratch || !validScratch(to_stream->rose, scratch)) { if (!scratch || !validScratch(scratch, to_stream->crc32)) {
return HS_INVALID; return HS_INVALID;
} }
if (unlikely(markScratchInUse(scratch))) { if (unlikely(markScratchInUse(scratch))) {

4
src/scratch.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2019, Intel Corporation * Copyright (c) 2015-2022, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -373,6 +373,7 @@ hs_error_t HS_CDECL hs_alloc_scratch(const hs_database_t *db,
hs_scratch_free((*scratch)->scratch_alloc); hs_scratch_free((*scratch)->scratch_alloc);
} }
proto->db_crc = db->crc32;
hs_error_t alloc_ret = alloc_scratch(proto, scratch); hs_error_t alloc_ret = alloc_scratch(proto, scratch);
hs_scratch_free(proto_tmp); /* kill off temp used for sizing */ hs_scratch_free(proto_tmp); /* kill off temp used for sizing */
if (alloc_ret != HS_SUCCESS) { if (alloc_ret != HS_SUCCESS) {
@ -380,6 +381,7 @@ hs_error_t HS_CDECL hs_alloc_scratch(const hs_database_t *db,
return alloc_ret; return alloc_ret;
} }
} else { } else {
(*scratch)->db_crc = db->crc32;
hs_scratch_free(proto_tmp); /* kill off temp used for sizing */ hs_scratch_free(proto_tmp); /* kill off temp used for sizing */
unmarkScratchInUse(*scratch); unmarkScratchInUse(*scratch);
} }

3
src/scratch.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2019, Intel Corporation * Copyright (c) 2015-2022, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -171,6 +171,7 @@ struct match_deduper {
*/ */
struct ALIGN_CL_DIRECTIVE hs_scratch { struct ALIGN_CL_DIRECTIVE hs_scratch {
u32 magic; u32 magic;
u32 db_crc; /**< identity of a scratch space, for validity check */
u8 in_use; /**< non-zero when being used by an API call. */ u8 in_use; /**< non-zero when being used by an API call. */
u32 queueCount; u32 queueCount;
u32 activeQueueArraySize; /**< size of active queue array fatbit in bytes */ u32 activeQueueArraySize; /**< size of active queue array fatbit in bytes */

5
src/state.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, Intel Corporation * Copyright (c) 2015-2022, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -57,6 +57,9 @@ struct hs_stream {
/** \brief The current stream offset. */ /** \brief The current stream offset. */
u64a offset; u64a offset;
/** \brief Identity of hs_stream, for scratch validity check. */
u32 crc32;
}; };
#define getMultiState(hs_s) ((char *)(hs_s) + sizeof(*(hs_s))) #define getMultiState(hs_s) ((char *)(hs_s) + sizeof(*(hs_s)))

3
src/stream_compress_impl.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017-2018, Intel Corporation * Copyright (c) 2017-2022, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -116,6 +116,7 @@ size_t JOIN(sc_, FN_SUFFIX)(const struct RoseEngine *rose,
= ((STREAM_QUAL char *)stream) + sizeof(struct hs_stream); = ((STREAM_QUAL char *)stream) + sizeof(struct hs_stream);
COPY_FIELD(stream->offset); COPY_FIELD(stream->offset);
COPY_FIELD(stream->crc32);
ASSIGN(stream->rose, rose); ASSIGN(stream->rose, rose);
COPY(stream_body + ROSE_STATE_OFFSET_STATUS_FLAGS, 1); COPY(stream_body + ROSE_STATE_OFFSET_STATUS_FLAGS, 1);