diff options
| author | Kees Cook <[email protected]> | 2020-08-21 12:42:44 -0700 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2020-09-01 09:50:35 +0200 |
| commit | d812db78288d76d1e8c6df3a840c41a8875f6468 (patch) | |
| tree | a5266e6e4fff64b7c58f4337cf7d0f78f746d8f5 | |
| parent | dfbe69689b4dee19021d8c315a5137b4790b5634 (diff) | |
vmlinux.lds.h: Avoid KASAN and KCSAN's unwanted sections
KASAN (-fsanitize=kernel-address) and KCSAN (-fsanitize=thread)
produce unwanted[1] .eh_frame and .init_array.* sections. Add them to
COMMON_DISCARDS, except with CONFIG_CONSTRUCTORS, which wants to keep
.init_array.* sections.
[1] https://bugs.llvm.org/show_bug.cgi?id=46478
Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Tested-by: Marco Elver <[email protected]>
Cc: [email protected]
Link: https://lore.kernel.org/r/[email protected]
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index f1f02a2f71b7..6b89a03e636e 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -954,7 +954,27 @@ EXIT_DATA #endif +/* + * Clang's -fsanitize=kernel-address and -fsanitize=thread produce + * unwanted sections (.eh_frame and .init_array.*), but + * CONFIG_CONSTRUCTORS wants to keep any .init_array.* sections. + * https://bugs.llvm.org/show_bug.cgi?id=46478 + */ +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KCSAN) +# ifdef CONFIG_CONSTRUCTORS +# define SANITIZER_DISCARDS \ + *(.eh_frame) +# else +# define SANITIZER_DISCARDS \ + *(.init_array) *(.init_array.*) \ + *(.eh_frame) +# endif +#else +# define SANITIZER_DISCARDS +#endif + #define COMMON_DISCARDS \ + SANITIZER_DISCARDS \ *(.discard) \ *(.discard.*) \ *(.modinfo) \ |