luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kasan: kasan_reset_tag rename kasan_clear_tag

Browse source 
The clear tag is more explicit than the reset tag.

Signed-off-by: wangmingrong1 <wangmingrong1@xiaomi.com>
This commit is contained in:
wangmingrong1 2025-03-03 10:05:40 +08:00 • committed by Xiang Xiao
parent 8f6be9a9b5
commit c6da553788
10 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/virtio/virtio-mmio.c
View file

@ -344,17 +344,17 @@ static int virtio_mmio_config_virtqueue(FAR struct metal_io_region *io,
metal_io_write32(io, VIRTIO_MMIO_QUEUE_NUM, vq->vq_nentries);
addr = (uint64_t)((uintptr_t)
kasan_reset_tag((FAR void *)vq->vq_ring.desc));
kasan_clear_tag((FAR void *)vq->vq_ring.desc));
metal_io_write32(io, VIRTIO_MMIO_QUEUE_DESC_LOW, addr);
metal_io_write32(io, VIRTIO_MMIO_QUEUE_DESC_HIGH, addr >> 32);
addr = (uint64_t)((uintptr_t)
kasan_reset_tag((FAR void *)vq->vq_ring.avail));
kasan_clear_tag((FAR void *)vq->vq_ring.avail));
metal_io_write32(io, VIRTIO_MMIO_QUEUE_AVAIL_LOW, addr);
metal_io_write32(io, VIRTIO_MMIO_QUEUE_AVAIL_HIGH, addr >> 32);
addr = (uint64_t)((uintptr_t)
kasan_reset_tag((FAR void *)vq->vq_ring.used));
kasan_clear_tag((FAR void *)vq->vq_ring.used));
metal_io_write32(io, VIRTIO_MMIO_QUEUE_USED_LOW, addr);
metal_io_write32(io, VIRTIO_MMIO_QUEUE_USED_HIGH, addr >> 32);

6
include/nuttx/mm/kasan.h
View file

@ -41,7 +41,7 @@
# define kasan_unpoison(addr, size) addr
# define kasan_register(addr, size)
# define kasan_unregister(addr)
# define kasan_reset_tag(addr) addr
# define kasan_clear_tag(addr) addr
# define kasan_start()
# define kasan_stop()
# define kasan_debugpoint(t,a,s) 0
@ -133,7 +133,7 @@ void kasan_register(FAR void *addr, FAR size_t *size);
void kasan_unregister(FAR void *addr);
/****************************************************************************
* Name: kasan_reset_tag
* Name: kasan_clear_tag
*
* Input Parameters:
* addr - The address of the memory to reset the tag.
@ -143,7 +143,7 @@ void kasan_unregister(FAR void *addr);
*
****************************************************************************/
FAR void *kasan_reset_tag(FAR const void *addr);
FAR void *kasan_clear_tag(FAR const void *addr);
/****************************************************************************
* Name: kasan_start

4
libs/libc/machine/arm64/arch_elf.c
View file

@ -184,8 +184,8 @@ aarch64_insn_encode_immediate(enum insn_imm_type_e type,
static uint64_t do_reloc(enum reloc_op_e op,
uintptr_t place, uint64_t val)
{
val = (uint64_t)kasan_reset_tag((const void *)val);
place = (uint64_t)kasan_reset_tag((const void *)place);
val = (uint64_t)kasan_clear_tag((FAR const void *)val);
place = (uint64_t)kasan_clear_tag((FAR const void *)place);
switch (op)
{

2
mm/kasan/generic.c
View file

@ -204,7 +204,7 @@ static void kasan_set_poison(FAR const void *addr, size_t size,
* Public Functions
****************************************************************************/
FAR void *kasan_reset_tag(FAR const void *addr)
FAR void *kasan_clear_tag(FAR const void *addr)
{
return (FAR void *)addr;
}

4
mm/kasan/sw_tags.c
View file

@ -81,7 +81,7 @@ kasan_mem_to_shadow(FAR const void *ptr, size_t size)
uintptr_t addr;
int i;
addr = (uintptr_t)kasan_reset_tag(ptr);
addr = (uintptr_t)kasan_clear_tag(ptr);
for (i = 0; i < g_region_count; i++)
{
@ -156,7 +156,7 @@ static void kasan_set_poison(FAR const void *addr,
* Public Functions
****************************************************************************/
FAR void *kasan_reset_tag(FAR const void *addr)
FAR void *kasan_clear_tag(FAR const void *addr)
{
return (FAR void *)
(((uint64_t)(addr)) & ~((uint64_t)0xff << KASAN_TAG_SHIFT));

14
mm/mempool/mempool_multiple.c
View file

@ -309,7 +309,7 @@ mempool_multiple_get_dict(FAR struct mempool_multiple_s *mpool,
}
addr = (FAR void *)ALIGN_DOWN((uintptr_t)blk, mpool->expandsize);
if (kasan_reset_tag(blk) == kasan_reset_tag(addr))
if (kasan_clear_tag(blk) == kasan_clear_tag(addr))
{
/* It is not a memory block allocated by mempool
* Because the blk is need not aligned with the expandsize
@ -328,10 +328,10 @@ mempool_multiple_get_dict(FAR struct mempool_multiple_s *mpool,
row = index >> mpool->dict_col_num_log2;
col = index - (row << mpool->dict_col_num_log2);
addr = kasan_reset_tag(addr);
if (kasan_reset_tag(mpool->dict[row]) == NULL ||
kasan_reset_tag(mpool->dict[row][col].addr) != addr ||
((FAR char *)kasan_reset_tag(blk) -
addr = kasan_clear_tag(addr);
if (kasan_clear_tag(mpool->dict[row]) == NULL ||
kasan_clear_tag(mpool->dict[row][col].addr) != addr ||
((FAR char *)kasan_clear_tag(blk) -
(FAR char *)addr >= mpool->dict[row][col].size))
{
return NULL;
@ -630,8 +630,8 @@ int mempool_multiple_free(FAR struct mempool_multiple_s *mpool,
return -EINVAL;
}
blk = (FAR char *)blk - (((FAR char *)kasan_reset_tag(blk) -
((FAR char *)kasan_reset_tag(dict->addr) +
blk = (FAR char *)blk - (((FAR char *)kasan_clear_tag(blk) -
((FAR char *)kasan_clear_tag(dict->addr) +
mpool->minpoolsize)) %
MEMPOOL_REALBLOCKSIZE(dict->pool));
mempool_release(dict->pool, blk);

2
mm/mm_heap/mm_free.c
View file

@ -128,7 +128,7 @@ void mm_delayfree(FAR struct mm_heap_s *heap, FAR void *mem, bool delay)
/* Map the memory chunk into a free node */
node = (FAR struct mm_freenode_s *)
((FAR char *)kasan_reset_tag(mem) - MM_SIZEOF_ALLOCNODE);
((FAR char *)kasan_clear_tag(mem) - MM_SIZEOF_ALLOCNODE);
nodesize = MM_SIZEOF_NODE(node);
/* Sanity check against double-frees */

2
mm/mm_heap/mm_heapmember.c
View file

@ -57,7 +57,7 @@
bool mm_heapmember(FAR struct mm_heap_s *heap, FAR void *mem)
{
mem = kasan_reset_tag(mem);
mem = kasan_clear_tag(mem);
#if CONFIG_MM_REGIONS > 1
int i;

2
mm/mm_heap/mm_memalign.c
View file

@ -142,7 +142,7 @@ FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment,
kasan_poison((FAR void *)rawchunk,
mm_malloc_size(heap, (FAR void *)rawchunk));
rawchunk = (uintptr_t)kasan_reset_tag((FAR void *)rawchunk);
rawchunk = (uintptr_t)kasan_clear_tag((FAR void *)rawchunk);
/* We need to hold the MM mutex while we muck with the chunks and
* nodelist.

2
mm/mm_heap/mm_realloc.c
View file

@ -132,7 +132,7 @@ FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem,
/* Map the memory chunk into an allocated node structure */
oldnode = (FAR struct mm_allocnode_s *)
((FAR char *)kasan_reset_tag(oldmem) - MM_SIZEOF_ALLOCNODE);
((FAR char *)kasan_clear_tag(oldmem) - MM_SIZEOF_ALLOCNODE);
/* We need to hold the MM mutex while we muck with the nodelist. */