Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 03:45:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mm/mempool: fix mempool crash when use KASAN SW_TAG

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd
2024-03-26 11:12:59 +08:00
committed by Xiang Xiao
parent 5258e48be6
commit 183ff9b6cc
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/mempool/mempool_multiple.c
+9 -4
View File
@@ -31,6 +31,7 @@
#include <nuttx/mutex.h> #include <nuttx/mutex.h>
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
#include <nuttx/mm/mempool.h> #include <nuttx/mm/mempool.h>
#include <nuttx/mm/kasan.h>
#include <assert.h> #include <assert.h>
@@ -169,7 +170,7 @@ mempool_multiple_alloc_chunk(FAR struct mempool_multiple_s *mpool,
mpool->alloced += mpool->alloc_size(mpool->arg, ret); mpool->alloced += mpool->alloc_size(mpool->arg, ret);
} }
return ret; return kasan_reset_tag(ret);
} }
chunk = (FAR struct mpool_chunk_s *)sq_peek(&mpool->chunk_queue); chunk = (FAR struct mpool_chunk_s *)sq_peek(&mpool->chunk_queue);
@@ -185,6 +186,8 @@ retry:
return NULL; return NULL;
} }
tmp = kasan_reset_tag(tmp);
mpool->alloced += mpool->alloc_size(mpool->arg, tmp); mpool->alloced += mpool->alloc_size(mpool->arg, tmp);
chunk = (FAR struct mpool_chunk_s *)(tmp + mpool->chunk_size); chunk = (FAR struct mpool_chunk_s *)(tmp + mpool->chunk_size);
chunk->end = tmp + mpool->chunk_size; chunk->end = tmp + mpool->chunk_size;
@@ -447,8 +450,7 @@ mempool_multiple_init(FAR const char *name,
mpool->arg = arg; mpool->arg = arg;
mpool->alloced = alloc_size(arg, mpool); mpool->alloced = alloc_size(arg, mpool);
sq_init(&mpool->chunk_queue); sq_init(&mpool->chunk_queue);
pools = mempool_multiple_alloc_chunk(mpool, sizeof(uintptr_t), pools = alloc(arg, sizeof(uintptr_t), npools * sizeof(struct mempool_s));
npools * sizeof(struct mempool_s));
if (pools == NULL) if (pools == NULL)
{ {
goto err_with_mpool; goto err_with_mpool;
@@ -594,6 +596,7 @@ FAR void *mempool_multiple_realloc(FAR struct mempool_multiple_s *mpool,
return mempool_multiple_alloc(mpool, size); return mempool_multiple_alloc(mpool, size);
} }
oldblk = kasan_reset_tag(oldblk);
dict = mempool_multiple_get_dict(mpool, oldblk); dict = mempool_multiple_get_dict(mpool, oldblk);
if (dict == NULL) if (dict == NULL)
{ {
@@ -632,6 +635,7 @@ int mempool_multiple_free(FAR struct mempool_multiple_s *mpool,
{ {
FAR struct mpool_dict_s *dict; FAR struct mpool_dict_s *dict;
blk = kasan_reset_tag(blk);
dict = mempool_multiple_get_dict(mpool, blk); dict = mempool_multiple_get_dict(mpool, blk);
if (dict == NULL) if (dict == NULL)
{ {
@@ -667,6 +671,7 @@ ssize_t mempool_multiple_alloc_size(FAR struct mempool_multiple_s *mpool,
DEBUGASSERT(blk != NULL); DEBUGASSERT(blk != NULL);
blk = kasan_reset_tag(blk);
dict = mempool_multiple_get_dict(mpool, blk); dict = mempool_multiple_get_dict(mpool, blk);
if (dict == NULL) if (dict == NULL)
{ {
@@ -895,7 +900,7 @@ void mempool_multiple_deinit(FAR struct mempool_multiple_s *mpool)
} }
mempool_multiple_free_chunk(mpool, mpool->dict); mempool_multiple_free_chunk(mpool, mpool->dict);
mempool_multiple_free_chunk(mpool, mpool->pools);
nxrmutex_destroy(&mpool->lock); nxrmutex_destroy(&mpool->lock);
mpool->free(mpool->arg, mpool->pools);
mpool->free(mpool->arg, mpool); mpool->free(mpool->arg, mpool);
} }