diff options
| author |   Alexander Potapenko <glider@google.com> | 2022-10-24 23:21:44 +0200 |
|---|---|---|
| committer |   Andrew Morton <akpm@linux-foundation.org> | 2022-10-28 13:37:23 -0700 |
| commit | 78a498c3a227f2ac773a8234b2ce092a4403f2c3 (patch) | |
| tree | d7efd152160584209dfcbde2aa4cfaa65f728425 /include/linux/kmsan_string.h | |
| parent | x86: asm: make sure __put_user_size() evaluates pointer once (diff) | |
| download | linux-dev-78a498c3a227f2ac773a8234b2ce092a4403f2c3.tar.xz linux-dev-78a498c3a227f2ac773a8234b2ce092a4403f2c3.zip | |
x86: fortify: kmsan: fix KMSAN fortify builds
Ensure that KMSAN builds replace memset/memcpy/memmove calls with the
respective __msan_XXX functions, and that none of the macros are redefined
twice. This should allow building kernel with both CONFIG_KMSAN and
CONFIG_FORTIFY_SOURCE.
Link: https://lkml.kernel.org/r/20221024212144.2852069-5-glider@google.com
Link: https://github.com/google/kmsan/issues/89
Signed-off-by: Alexander Potapenko <glider@google.com>
Reported-by: Tamas K Lengyel <tamas.lengyel@zentific.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'include/linux/kmsan_string.h')
| -rw-r--r-- | include/linux/kmsan_string.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/include/linux/kmsan_string.h b/include/linux/kmsan_string.h new file mode 100644 index 000000000000..7287da6f52ef --- /dev/null +++ b/include/linux/kmsan_string.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * KMSAN string functions API used in other headers. + * + * Copyright (C) 2022 Google LLC + * Author: Alexander Potapenko <glider@google.com> + * + */ +#ifndef _LINUX_KMSAN_STRING_H +#define _LINUX_KMSAN_STRING_H + +/* + * KMSAN overrides the default memcpy/memset/memmove implementations in the + * kernel, which requires having __msan_XXX function prototypes in several other + * headers. Keep them in one place instead of open-coding. + */ +void *__msan_memcpy(void *dst, const void *src, size_t size); +void *__msan_memset(void *s, int c, size_t n); +void *__msan_memmove(void *dest, const void *src, size_t len); + +#endif /* _LINUX_KMSAN_STRING_H */ |