diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 12:44:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 12:44:49 -0700 |
| commit | 2d60d96b6f00de90ec2bc60eb4cdcc46e1e1f161 (patch) | |
| tree | 32f01785f971d37bfe5521d0af978462a0a33dfb /security/Kconfig | |
| parent | eac7078a0fff1e72cf2b641721e3f55ec7e5e21e (diff) | |
| parent | 709a972efb01efaeb97cad1adc87fe400119c8ab (diff) | |
Merge tag 'meminit-v5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull compiler-based variable initialization updates from Kees Cook:
"This is effectively part of my gcc-plugins tree, but as this adds some
Clang support, it felt weird to still call it "gcc-plugins". :)
This consolidates Kconfig for the existing stack variable
initialization (via structleak and stackleak gcc plugins) and adds
Alexander Potapenko's support for Clang's new similar functionality.
Summary:
- Consolidate memory initialization Kconfigs (Kees)
- Implement support for Clang's stack variable auto-init (Alexander)"
* tag 'meminit-v5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
security: Implement Clang's stack initialization
security: Move stackleak config to Kconfig.hardening
security: Create "kernel hardening" config area
Diffstat (limited to 'security/Kconfig')
| -rw-r--r-- | security/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig index 353cfef71d4e..aeac3676dd4d 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -287,5 +287,7 @@ config LSM If unsure, leave this as the default. +source "security/Kconfig.hardening" + endmenu |