diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-15 11:45:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-15 11:45:54 -0400 |
| commit | 8c479c2c0f9dc105c0afaa662a22f39383d4ce92 (patch) | |
| tree | c93cddf47d604aab8ca49491cda0a751dd3da002 /security | |
| parent | 31130a16d459de809cd1c03eabc9567d094aae6a (diff) | |
| parent | b5cb15d9372abc9adc4e844c0c1bf594ca6a7695 (diff) | |
Merge tag 'hardened-usercopy-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardened usercopy updates from Kees Cook:
"This cleans up a minor Kconfig issue and adds a kernel boot option for
disabling hardened usercopy for distro users that may have corner-case
performance issues (e.g. high bandwidth small-packet UDP traffic).
Summary:
- drop unneeded Kconfig "select BUG" (Kamal Mostafa)
- add "hardened_usercopy=off" rare performance needs (Chris von
Recklinghausen)"
* tag 'hardened-usercopy-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
usercopy: Allow boot cmdline disabling of hardening
usercopy: Do not select BUG with HARDENED_USERCOPY
Diffstat (limited to 'security')
| -rw-r--r-- | security/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/Kconfig b/security/Kconfig index afa91c6f06bb..27d8b2688f75 100644 --- a/security/Kconfig +++ b/security/Kconfig | |||
| @@ -153,7 +153,6 @@ config HAVE_HARDENED_USERCOPY_ALLOCATOR | |||
| 153 | config HARDENED_USERCOPY | 153 | config HARDENED_USERCOPY |
| 154 | bool "Harden memory copies between kernel and userspace" | 154 | bool "Harden memory copies between kernel and userspace" |
| 155 | depends on HAVE_HARDENED_USERCOPY_ALLOCATOR | 155 | depends on HAVE_HARDENED_USERCOPY_ALLOCATOR |
| 156 | select BUG | ||
| 157 | imply STRICT_DEVMEM | 156 | imply STRICT_DEVMEM |
| 158 | help | 157 | help |
| 159 | This option checks for obviously wrong memory regions when | 158 | This option checks for obviously wrong memory regions when |