Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-12-18 16:36:09 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mm/kasan: extern kasan API only MM_KASAN is enabled

Browse Source 
this PR will fix g_region_init is incorrectly linked to the image if MM_KASAN is not enabled.

Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an
2024-10-25 13:45:28 +08:00
committed by Xiang Xiao
parent 6a2e21dd07
commit 052ea5b20d
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/nuttx/mm/kasan.h
View File

@@ -36,16 +36,20 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#define kasan_init_early() kasan_stop()
#ifndef CONFIG_MM_KASAN #ifndef CONFIG_MM_KASAN
# define kasan_poison(addr, size) # define kasan_poison(addr, size)
# define kasan_unpoison(addr, size) addr # define kasan_unpoison(addr, size) addr
# define kasan_register(addr, size) # define kasan_register(addr, size)
# define kasan_unregister(addr) # define kasan_unregister(addr)
# define kasan_reset_tag(addr) addr # define kasan_reset_tag(addr) addr
# define kasan_start()
# define kasan_stop()
# define kasan_debugpoint(t,a,s) 0
# define kasan_init_early()
#else #else
# define kasan_init_early() kasan_stop()
/**************************************************************************** /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
****************************************************************************/ ****************************************************************************/
@@ -141,8 +145,6 @@ void kasan_unregister(FAR void *addr);
FAR void *kasan_reset_tag(FAR const void *addr); FAR void *kasan_reset_tag(FAR const void *addr);
#endif /* CONFIG_MM_KASAN */
/**************************************************************************** /****************************************************************************
* Name: kasan_start * Name: kasan_start
* *
@@ -204,4 +206,6 @@ int kasan_debugpoint(int type, FAR void *addr, size_t size);
} }
#endif #endif
#endif /* CONFIG_MM_KASAN */
#endif /* __INCLUDE_NUTTX_MM_KASAN_H */ #endif /* __INCLUDE_NUTTX_MM_KASAN_H */

6
mm/kasan/hook.c
View File

@@ -115,7 +115,9 @@ struct kasan_watchpoint_s
static struct kasan_watchpoint_s g_watchpoint[MM_KASAN_WATCHPOINT]; static struct kasan_watchpoint_s g_watchpoint[MM_KASAN_WATCHPOINT];
#endif #endif
#ifdef CONFIG_MM_KASAN
static uint32_t g_region_init; static uint32_t g_region_init;
#endif
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
@@ -225,6 +227,7 @@ 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)
{ {
#ifdef CONFIG_MM_KASAN
if (predict_false(size == 0 || g_region_init != KASAN_INIT_VALUE)) if (predict_false(size == 0 || g_region_init != KASAN_INIT_VALUE))
{ {
return; return;
@@ -247,12 +250,14 @@ static inline void kasan_check_report(FAR const void *addr, size_t size,
# if MM_KASAN_WATCHPOINT > 0 # if MM_KASAN_WATCHPOINT > 0
kasan_check_watchpoint(addr, size, is_write, return_address); kasan_check_watchpoint(addr, size, is_write, return_address);
# endif # endif
#endif
} }
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_MM_KASAN
void kasan_start(void) void kasan_start(void)
{ {
g_region_init = KASAN_INIT_VALUE; g_region_init = KASAN_INIT_VALUE;
@@ -262,6 +267,7 @@ void kasan_stop(void)
{ {
g_region_init = 0; g_region_init = 0;
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: kasan_debugpoint * Name: kasan_debugpoint