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

pool: use errno style error reporting

Browse Source
pull/8304/head
Victor Julien 4 years ago
parent e621416d80
commit 8ef95c10a8
6 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File

3
src/stream-tcp-reassemble.c
Unescape Escape View File

@ -553,7 +553,8 @@ TcpReassemblyThreadCtx *StreamTcpReassembleInitThreadCtx(ThreadVars *tv)
} }
SCMutexUnlock(&segment_thread_pool_mutex); SCMutexUnlock(&segment_thread_pool_mutex);
if (ra_ctx->segment_thread_pool_id < 0 || segment_thread_pool == NULL) { if (ra_ctx->segment_thread_pool_id < 0 || segment_thread_pool == NULL) {
SCLogError(SC_ERR_MEM_ALLOC, "failed to setup/expand stream segment pool. Expand stream.reassembly.memcap?"); SCLogError(sc_errno,
"failed to setup/expand stream segment pool. Expand stream.reassembly.memcap?");
StreamTcpReassembleFreeThreadCtx(ra_ctx); StreamTcpReassembleFreeThreadCtx(ra_ctx);
SCReturnPtr(NULL, "TcpReassemblyThreadCtx"); SCReturnPtr(NULL, "TcpReassemblyThreadCtx");
} }

2
src/stream-tcp.c
Unescape Escape View File

@ -5466,7 +5466,7 @@ TmEcode StreamTcpThreadInit(ThreadVars *tv, void *initdata, void **data)
} }
SCMutexUnlock(&ssn_pool_mutex); SCMutexUnlock(&ssn_pool_mutex);
if (stt->ssn_pool_id < 0 || ssn_pool == NULL) { if (stt->ssn_pool_id < 0 || ssn_pool == NULL) {
SCLogError(SC_ERR_MEM_ALLOC, "failed to setup/expand stream session pool. Expand stream.memcap?"); SCLogError(sc_errno, "failed to setup/expand stream session pool. Expand stream.memcap?");
SCReturnInt(TM_ECODE_FAILED); SCReturnInt(TM_ECODE_FAILED);
} }

3
src/util-error.c
Unescape Escape View File

@ -103,8 +103,7 @@ const char * SCErrorToString(SCError err)
CASE_CODE (SC_ERR_ARG_LEN_LONG); CASE_CODE (SC_ERR_ARG_LEN_LONG);
CASE_CODE (SC_ERR_ALPARSER); CASE_CODE (SC_ERR_ALPARSER);
CASE_CODE (SC_ERR_POOL_EMPTY); CASE_CODE (SC_ERR_POOL_EMPTY);
CASE_CODE (SC_ERR_REASSEMBLY); CASE_CODE(SC_ERR_REASSEMBLY);
CASE_CODE (SC_ERR_POOL_INIT);
CASE_CODE (SC_ERR_UNIMPLEMENTED); CASE_CODE (SC_ERR_UNIMPLEMENTED);
CASE_CODE (SC_ERR_ADDRESS_ENGINE_GENERIC); CASE_CODE (SC_ERR_ADDRESS_ENGINE_GENERIC);
CASE_CODE (SC_ERR_PORT_ENGINE_GENERIC); CASE_CODE (SC_ERR_PORT_ENGINE_GENERIC);

1
src/util-error.h
Unescape Escape View File

@ -96,7 +96,6 @@ typedef enum {
SC_ERR_ARG_LEN_LONG, SC_ERR_ARG_LEN_LONG,
SC_ERR_POOL_EMPTY, SC_ERR_POOL_EMPTY,
SC_ERR_REASSEMBLY, SC_ERR_REASSEMBLY,
SC_ERR_POOL_INIT,
SC_ERR_NFQ_NOSUPPORT, SC_ERR_NFQ_NOSUPPORT,
SC_ERR_NFQ_OPEN, SC_ERR_NFQ_OPEN,
SC_ERR_NFQ_BIND, SC_ERR_NFQ_BIND,

11
src/util-pool-thread.c
Unescape Escape View File

@ -44,14 +44,18 @@ PoolThread *PoolThreadInit(int threads, uint32_t size, uint32_t prealloc_size,
uint32_t elt_size, void *(*Alloc)(void), int (*Init)(void *, void *), uint32_t elt_size, void *(*Alloc)(void), int (*Init)(void *, void *),
void *InitData, void (*Cleanup)(void *), void (*Free)(void *)) void *InitData, void (*Cleanup)(void *), void (*Free)(void *))
{ {
sc_errno = SC_OK;
if (threads <= 0) { if (threads <= 0) {
SCLogDebug("error"); SCLogDebug("error");
sc_errno = SC_EINVAL;
return NULL; return NULL;
} }
PoolThread *pt = SCCalloc(1, sizeof(*pt)); PoolThread *pt = SCCalloc(1, sizeof(*pt));
if (unlikely(pt == NULL)) { if (unlikely(pt == NULL)) {
SCLogDebug("memory alloc error"); SCLogDebug("memory alloc error");
sc_errno = SC_ENOMEM;
goto error; goto error;
} }
@ -59,6 +63,7 @@ PoolThread *PoolThreadInit(int threads, uint32_t size, uint32_t prealloc_size,
pt->array = SCMalloc(threads * sizeof(PoolThreadElement)); pt->array = SCMalloc(threads * sizeof(PoolThreadElement));
if (pt->array == NULL) { if (pt->array == NULL) {
SCLogDebug("memory alloc error"); SCLogDebug("memory alloc error");
sc_errno = SC_ENOMEM;
goto error; goto error;
} }
pt->size = threads; pt->size = threads;
@ -92,7 +97,7 @@ error:
int PoolThreadExpand(PoolThread *pt) int PoolThreadExpand(PoolThread *pt)
{ {
if (pt == NULL || pt->array == NULL || pt->size == 0) { if (pt == NULL || pt->array == NULL || pt->size == 0) {
SCLogError(SC_ERR_POOL_INIT, "pool grow failed"); SCLogError(SC_EINVAL, "pool grow failed");
return -1; return -1;
} }
@ -103,7 +108,7 @@ int PoolThreadExpand(PoolThread *pt)
if (ptmp == NULL) { if (ptmp == NULL) {
SCFree(pt->array); SCFree(pt->array);
pt->array = NULL; pt->array = NULL;
SCLogError(SC_ERR_POOL_INIT, "pool grow failed"); SCLogError(SC_EINVAL, "pool grow failed");
return -1; return -1;
} }
pt->array = ptmp; pt->array = ptmp;
@ -133,7 +138,7 @@ int PoolThreadExpand(PoolThread *pt)
settings.Cleanup, settings.Free); settings.Cleanup, settings.Free);
SCMutexUnlock(&e->lock); SCMutexUnlock(&e->lock);
if (e->pool == NULL) { if (e->pool == NULL) {
SCLogError(SC_ERR_POOL_INIT, "pool grow failed"); SCLogError(SC_EINVAL, "pool grow failed");
return -1; return -1;
} }

24
src/util-pool.c
Unescape Escape View File

@ -85,25 +85,27 @@ Pool *PoolInit(uint32_t size, uint32_t prealloc_size, uint32_t elt_size,
void *(*Alloc)(void), int (*Init)(void *, void *), void *InitData, void *(*Alloc)(void), int (*Init)(void *, void *), void *InitData,
void (*Cleanup)(void *), void (*Free)(void *)) void (*Cleanup)(void *), void (*Free)(void *))
{ {
sc_errno = SC_OK;
Pool *p = NULL; Pool *p = NULL;
if (size != 0 && prealloc_size > size) { if (size != 0 && prealloc_size > size) {
SCLogError(SC_ERR_POOL_INIT, "size error"); sc_errno = SC_EINVAL;
goto error; goto error;
} }
if (size != 0 && elt_size == 0) { if (size != 0 && elt_size == 0) {
SCLogError(SC_ERR_POOL_INIT, "size != 0 && elt_size == 0"); sc_errno = SC_EINVAL;
goto error; goto error;
} }
if (elt_size && Free) { if (elt_size && Free) {
SCLogError(SC_ERR_POOL_INIT, "elt_size && Free"); sc_errno = SC_EINVAL;
goto error; goto error;
} }
/* setup the filter */ /* setup the filter */
p = SCMalloc(sizeof(Pool)); p = SCMalloc(sizeof(Pool));
if (unlikely(p == NULL)) { if (unlikely(p == NULL)) {
SCLogError(SC_ERR_POOL_INIT, "alloc error"); sc_errno = SC_ENOMEM;
goto error; goto error;
} }
@ -128,7 +130,7 @@ Pool *PoolInit(uint32_t size, uint32_t prealloc_size, uint32_t elt_size,
if (size > 0) { if (size > 0) {
PoolBucket *pb = SCCalloc(size, sizeof(PoolBucket)); PoolBucket *pb = SCCalloc(size, sizeof(PoolBucket));
if (unlikely(pb == NULL)) { if (unlikely(pb == NULL)) {
SCLogError(SC_ERR_POOL_INIT, "alloc error"); sc_errno = SC_ENOMEM;
goto error; goto error;
} }
memset(pb, 0, size * sizeof(PoolBucket)); memset(pb, 0, size * sizeof(PoolBucket));
@ -145,7 +147,7 @@ Pool *PoolInit(uint32_t size, uint32_t prealloc_size, uint32_t elt_size,
p->data_buffer = SCCalloc(prealloc_size, elt_size); p->data_buffer = SCCalloc(prealloc_size, elt_size);
/* FIXME better goto */ /* FIXME better goto */
if (p->data_buffer == NULL) { if (p->data_buffer == NULL) {
SCLogError(SC_ERR_POOL_INIT, "alloc error"); sc_errno = SC_ENOMEM;
goto error; goto error;
} }
} }
@ -154,7 +156,7 @@ Pool *PoolInit(uint32_t size, uint32_t prealloc_size, uint32_t elt_size,
if (size == 0) { /* unlimited */ if (size == 0) { /* unlimited */
PoolBucket *pb = SCMalloc(sizeof(PoolBucket)); PoolBucket *pb = SCMalloc(sizeof(PoolBucket));
if (unlikely(pb == NULL)) { if (unlikely(pb == NULL)) {
SCLogError(SC_ERR_POOL_INIT, "alloc error"); sc_errno = SC_ENOMEM;
goto error; goto error;
} }
memset(pb, 0, sizeof(PoolBucket)); memset(pb, 0, sizeof(PoolBucket));
@ -165,17 +167,17 @@ Pool *PoolInit(uint32_t size, uint32_t prealloc_size, uint32_t elt_size,
pb->data = SCMalloc(p->elt_size); pb->data = SCMalloc(p->elt_size);
} }
if (pb->data == NULL) { if (pb->data == NULL) {
SCLogError(SC_ERR_POOL_INIT, "alloc error");
SCFree(pb); SCFree(pb);
sc_errno = SC_ENOMEM;
goto error; goto error;
} }
if (p->Init(pb->data, p->InitData) != 1) { if (p->Init(pb->data, p->InitData) != 1) {
SCLogError(SC_ERR_POOL_INIT, "init error");
if (p->Free) if (p->Free)
p->Free(pb->data); p->Free(pb->data);
else else
SCFree(pb->data); SCFree(pb->data);
SCFree(pb); SCFree(pb);
sc_errno = SC_EINVAL;
goto error; goto error;
} }
p->allocated++; p->allocated++;
@ -186,14 +188,14 @@ Pool *PoolInit(uint32_t size, uint32_t prealloc_size, uint32_t elt_size,
} else { } else {
PoolBucket *pb = p->empty_stack; PoolBucket *pb = p->empty_stack;
if (pb == NULL) { if (pb == NULL) {
SCLogError(SC_ERR_POOL_INIT, "alloc error"); sc_errno = SC_ENOMEM;
goto error; goto error;
} }
pb->data = (char *)p->data_buffer + u32 * elt_size; pb->data = (char *)p->data_buffer + u32 * elt_size;
if (p->Init(pb->data, p->InitData) != 1) { if (p->Init(pb->data, p->InitData) != 1) {
SCLogError(SC_ERR_POOL_INIT, "init error");
pb->data = NULL; pb->data = NULL;
sc_errno = SC_EINVAL;
goto error; goto error;
} }

Write Preview
Loading…
Cancel
Save