sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm/kasan: Add branch prediction and constant prediction

Browse Source 
Signed-off-by: wangmingrong1 <wangmingrong1@xiaomi.com>
This commit is contained in:
wangmingrong1 2024-09-03 12:41:03 +08:00 committed by Xiang Xiao
parent 63a371b261
commit 23981cdf3d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mm/kasan/hook.c
View File

@ -23,6 +23,7 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/mm/kasan.h> #include <nuttx/mm/kasan.h>
#include <nuttx/compiler.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <assert.h> #include <assert.h>
@ -204,7 +205,7 @@ static void kasan_check_watchpoint(FAR const void *addr, size_t size,
{ {
FAR struct kasan_watchpoint_s *watchpoint = &g_watchpoint[i]; FAR struct kasan_watchpoint_s *watchpoint = &g_watchpoint[i];
if (watchpoint->type == DEBUGPOINT_NONE) if (predict_false(watchpoint->type == DEBUGPOINT_NONE))
{ {
break; break;
} }
@ -228,20 +229,20 @@ static inline void kasan_check_report(FAR const void *addr, size_t size,
bool is_write, bool is_write,
FAR void *return_address) FAR void *return_address)
{ {
if (size == 0 || g_region_init != KASAN_INIT_VALUE) if (predict_false(size == 0 || g_region_init != KASAN_INIT_VALUE))
{ {
return; return;
} }
#ifndef CONFIG_MM_KASAN_DISABLE_NULL_POINTER_CHECK #ifndef CONFIG_MM_KASAN_DISABLE_NULL_POINTER_CHECK
if (addr == NULL) if (predict_false(addr == NULL))
{ {
kasan_report(addr, size, is_write, return_address); kasan_report(addr, size, is_write, return_address);
} }
#endif #endif
#ifndef CONFIG_MM_KASAN_NONE #ifndef CONFIG_MM_KASAN_NONE
if (kasan_is_poisoned(addr, size)) if (predict_false(kasan_is_poisoned(addr, size)))
{ {
kasan_report(addr, size, is_write, return_address); kasan_report(addr, size, is_write, return_address);
} }