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 /init | |
| 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 'init')
| -rw-r--r-- | init/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Makefile b/init/Makefile index 8316c23bead2..26de459006c4 100644 --- a/init/Makefile +++ b/init/Makefile @@ -59,3 +59,4 @@ include/generated/utsversion.h: FORCE $(obj)/version-timestamp.o: include/generated/utsversion.h CFLAGS_version-timestamp.o := -include include/generated/utsversion.h +KASAN_SANITIZE_version-timestamp.o := n |