From c0a7eefb459c8262a7e29f6660e5e6436cc792e0 Mon Sep 17 00:00:00 2001 From: Mike Pagano Date: Sun, 5 Dec 2021 18:35:14 -0500 Subject: Remove KSPP setting for HARDENED_USERCOPY_FALLBACK This config option has been removed in 5.16. Signed-off-by: Mike Pagano --- 4567_distro-Gentoo-Kconfig.patch | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch index 95a64aa2..05570254 100644 --- a/4567_distro-Gentoo-Kconfig.patch +++ b/4567_distro-Gentoo-Kconfig.patch @@ -290,19 +290,9 @@ + See the settings that become available for more details and fine-tuning. + +endmenu -diff --git a/security/Kconfig b/security/Kconfig -index 7561f6f99..01f0bf73f 100644 ---- a/security/Kconfig -+++ b/security/Kconfig -@@ -166,6 +166,7 @@ config HARDENED_USERCOPY - config HARDENED_USERCOPY_FALLBACK - bool "Allow usercopy whitelist violations to fallback to object size" - depends on HARDENED_USERCOPY -+ depends on !GENTOO_KERNEL_SELF_PROTECTION - default y - help - This is a temporary option that allows missing usercopy whitelists -@@ -181,6 +182,7 @@ config HARDENED_USERCOPY_PAGESPAN +--- a/security/Kconfig 2021-12-05 18:20:55.655677710 -0500 ++++ b/security/Kconfig 2021-12-05 18:23:42.404251618 -0500 +@@ -167,6 +167,7 @@ config HARDENED_USERCOPY_PAGESPAN bool "Refuse to copy allocations that span multiple pages" depends on HARDENED_USERCOPY depends on EXPERT -- cgit v1.2.3-65-gdbad