Skip to content

mm/kasan: fix judge mm_heapmenber when use tags kasan #18317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
W-M-R wants to merge 1 commit into from
+4 −4
Closed

mm/kasan: fix judge mm_heapmenber when use tags kasan #18317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions mm/mm_heap/mm_heapmember.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ bool mm_heapmember(FAR struct mm_heap_s *heap, FAR void *mem)

for (i = 0; i < heap->mm_nregions; i++)
{
if (mem > (FAR void *)heap->mm_heapstart[i] &&
mem < (FAR void *)heap->mm_heapend[i])
if (mem > kasan_clear_tag((FAR void *)heap->mm_heapstart[i]) &&
mem < kasan_clear_tag((FAR void *)heap->mm_heapend[i]))
{
return true;
}
Expand All @@ -83,8 +83,8 @@ bool mm_heapmember(FAR struct mm_heap_s *heap, FAR void *mem)
* two guard nodes.
*/

if (mem > (FAR void *)heap->mm_heapstart[0] &&
mem < (FAR void *)heap->mm_heapend[0])
if (mem > kasan_clear_tag((FAR void *)heap->mm_heapstart[0]) &&
mem < kasan_clear_tag((FAR void *)heap->mm_heapend[0]))
{
return true;
}
Expand Down
Loading