Commit 27f644dc authored by Alexander Potapenko's avatar Alexander Potapenko Committed by Andrew Morton

x86: kmsan: use C versions of memset16/memset32/memset64

KMSAN must see as many memory accesses as possible to prevent false
positive reports.  Fall back to versions of
memset16()/memset32()/memset64() implemented in lib/string.c instead of
those written in assembly.

Link: https://lkml.kernel.org/r/20230303141433.3422671-3-glider@google.comSigned-off-by: default avatarAlexander Potapenko <glider@google.com>
Suggested-by: default avatarTetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Reviewed-by: default avatarMarco Elver <elver@google.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Helge Deller <deller@gmx.de>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d3402925
...@@ -22,6 +22,11 @@ extern void *__memcpy(void *to, const void *from, size_t len); ...@@ -22,6 +22,11 @@ extern void *__memcpy(void *to, const void *from, size_t len);
void *memset(void *s, int c, size_t n); void *memset(void *s, int c, size_t n);
void *__memset(void *s, int c, size_t n); void *__memset(void *s, int c, size_t n);
/*
* KMSAN needs to instrument as much code as possible. Use C versions of
* memsetXX() from lib/string.c under KMSAN.
*/
#if !defined(CONFIG_KMSAN)
#define __HAVE_ARCH_MEMSET16 #define __HAVE_ARCH_MEMSET16
static inline void *memset16(uint16_t *s, uint16_t v, size_t n) static inline void *memset16(uint16_t *s, uint16_t v, size_t n)
{ {
...@@ -57,6 +62,7 @@ static inline void *memset64(uint64_t *s, uint64_t v, size_t n) ...@@ -57,6 +62,7 @@ static inline void *memset64(uint64_t *s, uint64_t v, size_t n)
: "memory"); : "memory");
return s; return s;
} }
#endif
#define __HAVE_ARCH_MEMMOVE #define __HAVE_ARCH_MEMMOVE
void *memmove(void *dest, const void *src, size_t count); void *memmove(void *dest, const void *src, size_t count);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment