diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-14 10:04:00 -0600 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-14 10:04:00 -0600 |
commit | 880ca43e5c334c32a8af125e456d1a23314aa416 (patch) | |
tree | 069120514640c3e994bd700eb93d055b2b124917 /scripts | |
parent | 8b7be52f3f0d0c24ee147ba7cab6c7fa4f9bcfbb (diff) | |
parent | 42633ed852deadc14d44660ad71e2f6640239120 (diff) |
Merge tag 'hardening-v6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull kernel hardening fixes from Kees Cook:
- Fix CFI hash randomization with KASAN (Sami Tolvanen)
- Check size of coreboot table entry and use flex-array
* tag 'hardening-v6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
kbuild: Fix CFI hash randomization with KASAN
firmware: coreboot: Check size of table entry and use flex-array
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.vmlinux | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Makefile.vmlinux b/scripts/Makefile.vmlinux index 49946cb96844..10176dec97ea 100644 --- a/scripts/Makefile.vmlinux +++ b/scripts/Makefile.vmlinux @@ -18,6 +18,7 @@ quiet_cmd_cc_o_c = CC $@ $(call if_changed_dep,cc_o_c) ifdef CONFIG_MODULES +KASAN_SANITIZE_.vmlinux.export.o := n targets += .vmlinux.export.o vmlinux: .vmlinux.export.o endif |