summaryrefslogtreecommitdiff
path: root/security/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-08-15 08:45:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-15 08:45:54 -0700
commit8c479c2c0f9dc105c0afaa662a22f39383d4ce92 (patch)
treec93cddf47d604aab8ca49491cda0a751dd3da002 /security/Kconfig
parent31130a16d459de809cd1c03eabc9567d094aae6a (diff)
parentb5cb15d9372abc9adc4e844c0c1bf594ca6a7695 (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/Kconfig')
-rw-r--r--security/Kconfig1
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
config HARDENED_USERCOPY
bool "Harden memory copies between kernel and userspace"
depends on HAVE_HARDENED_USERCOPY_ALLOCATOR
- select BUG
imply STRICT_DEVMEM
help
This option checks for obviously wrong memory regions when