diff options
author | Andrey Konovalov <andreyknvl@google.com> | 2018-12-28 03:29:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-28 15:11:43 -0500 |
commit | 2bd926b439b4cb6b9ed240a9781cd01958b53d85 (patch) | |
tree | bfdd9f2a3f0111b3a3510032aabdc6f90ce73ed4 /include/linux/compiler-clang.h | |
parent | b938fcf42739de8270e6ea41593722929c8a7dd0 (diff) |
kasan: add CONFIG_KASAN_GENERIC and CONFIG_KASAN_SW_TAGS
This commit splits the current CONFIG_KASAN config option into two:
1. CONFIG_KASAN_GENERIC, that enables the generic KASAN mode (the one
that exists now);
2. CONFIG_KASAN_SW_TAGS, that enables the software tag-based KASAN mode.
The name CONFIG_KASAN_SW_TAGS is chosen as in the future we will have
another hardware tag-based KASAN mode, that will rely on hardware memory
tagging support in arm64.
With CONFIG_KASAN_SW_TAGS enabled, compiler options are changed to
instrument kernel files with -fsantize=kernel-hwaddress (except the ones
for which KASAN_SANITIZE := n is set).
Both CONFIG_KASAN_GENERIC and CONFIG_KASAN_SW_TAGS support both
CONFIG_KASAN_INLINE and CONFIG_KASAN_OUTLINE instrumentation modes.
This commit also adds empty placeholder (for now) implementation of
tag-based KASAN specific hooks inserted by the compiler and adjusts
common hooks implementation.
While this commit adds the CONFIG_KASAN_SW_TAGS config option, this option
is not selectable, as it depends on HAVE_ARCH_KASAN_SW_TAGS, which we will
enable once all the infrastracture code has been added.
Link: http://lkml.kernel.org/r/b2550106eb8a68b10fefbabce820910b115aa853.1544099024.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/compiler-clang.h')
-rw-r--r-- | include/linux/compiler-clang.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/compiler-clang.h b/include/linux/compiler-clang.h index 3e7dafb3ea80..39f668d5066b 100644 --- a/include/linux/compiler-clang.h +++ b/include/linux/compiler-clang.h | |||
@@ -16,9 +16,13 @@ | |||
16 | /* all clang versions usable with the kernel support KASAN ABI version 5 */ | 16 | /* all clang versions usable with the kernel support KASAN ABI version 5 */ |
17 | #define KASAN_ABI_VERSION 5 | 17 | #define KASAN_ABI_VERSION 5 |
18 | 18 | ||
19 | #if __has_feature(address_sanitizer) || __has_feature(hwaddress_sanitizer) | ||
19 | /* emulate gcc's __SANITIZE_ADDRESS__ flag */ | 20 | /* emulate gcc's __SANITIZE_ADDRESS__ flag */ |
20 | #if __has_feature(address_sanitizer) | ||
21 | #define __SANITIZE_ADDRESS__ | 21 | #define __SANITIZE_ADDRESS__ |
22 | #define __no_sanitize_address \ | ||
23 | __attribute__((no_sanitize("address", "hwaddress"))) | ||
24 | #else | ||
25 | #define __no_sanitize_address | ||
22 | #endif | 26 | #endif |
23 | 27 | ||
24 | /* | 28 | /* |