diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-11 20:00:55 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-11 20:00:55 -1000 |
| commit | 1746f4db513563bb22e0ba0c419d0c90912dfae1 (patch) | |
| tree | d9d62aa56c89654daf622cb4ef7fa4a1ddfb6503 | |
| parent | fd66ad69ef5a59f303b595ac8ecf454f213cb7e6 (diff) | |
| parent | 848378812e40152abe9b9baf58ce2004f76fb988 (diff) | |
Merge tag 'orphans-v5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull orphan section linker fix from Kees Cook:
- Handle changes to Clang's Sanitizer section layout (Nathan
Chancellor)
* tag 'orphans-v5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
vmlinux.lds.h: Handle clang's module.{c,d}tor sections
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 17325416e2de..62669b36a772 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -586,6 +586,7 @@ NOINSTR_TEXT \ *(.text..refcount) \ *(.ref.text) \ + *(.text.asan.* .text.tsan.*) \ TEXT_CFI_JT \ MEM_KEEP(init.text*) \ MEM_KEEP(exit.text*) \ |