catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-25 17:58:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

[firmware] WIP: make talloc irq-safe

Browse Source
This commit is contained in:
Harald Welte
2017-11-04 00:06:03 +01:00
parent eb50c9f914
commit 7b36306113
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/libcommon/source/pseudo_talloc.c
View File

@@ -13,8 +13,11 @@ static uint8_t msgb_inuse[NUM_RCTX_SMALL];
void *_talloc_zero(const void *ctx, size_t size, const char *name) void *_talloc_zero(const void *ctx, size_t size, const char *name)
{ {
unsigned int i; unsigned int i;
unsigned long x;
local_irq_save(x);
if (size > RCTX_SIZE_SMALL) { if (size > RCTX_SIZE_SMALL) {
local_irq_restore(x);
TRACE_ERROR("%s() request too large(%d > %d)\r\n", __func__, size, RCTX_SIZE_SMALL); TRACE_ERROR("%s() request too large(%d > %d)\r\n", __func__, size, RCTX_SIZE_SMALL);
return NULL; return NULL;
} }
@@ -24,9 +27,11 @@ void *_talloc_zero(const void *ctx, size_t size, const char *name)
uint8_t *out = msgb_data[i]; uint8_t *out = msgb_data[i];
msgb_inuse[i] = 1; msgb_inuse[i] = 1;
memset(out, 0, size); memset(out, 0, size);
local_irq_restore(x);
return out; return out;
} }
} }
local_irq_restore(x);
TRACE_ERROR("%s() out of memory!\r\n", __func__); TRACE_ERROR("%s() out of memory!\r\n", __func__);
return NULL; return NULL;
} }
@@ -34,6 +39,9 @@ void *_talloc_zero(const void *ctx, size_t size, const char *name)
int _talloc_free(void *ptr, const char *location) int _talloc_free(void *ptr, const char *location)
{ {
unsigned int i; unsigned int i;
unsigned long x;
local_irq_save(x);
for (i = 0; i < ARRAY_SIZE(msgb_inuse); i++) { for (i = 0; i < ARRAY_SIZE(msgb_inuse); i++) {
if (ptr == msgb_data[i]) { if (ptr == msgb_data[i]) {
if (!msgb_inuse[i]) { if (!msgb_inuse[i]) {
@@ -41,10 +49,12 @@ int _talloc_free(void *ptr, const char *location)
} else { } else {
msgb_inuse[i] = 0; msgb_inuse[i] = 0;
} }
local_irq_restore(x);
return 0; return 0;
} }
} }
local_irq_restore(x);
TRACE_ERROR("%s: invalid pointer %p from %s\r\n", __func__, ptr, location); TRACE_ERROR("%s: invalid pointer %p from %s\r\n", __func__, ptr, location);
return -1; return -1;
} }