Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:master commit in: /
Date: Sun, 05 Dec 2021 23:36:30
Message-Id: 1638747314.c0a7eefb459c8262a7e29f6660e5e6436cc792e0.mpagano@gentoo
1 commit: c0a7eefb459c8262a7e29f6660e5e6436cc792e0
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 5 23:35:14 2021 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 5 23:35:14 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=c0a7eefb
7
8 Remove KSPP setting for HARDENED_USERCOPY_FALLBACK
9
10 This config option has been removed in 5.16.
11
12 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
13
14 4567_distro-Gentoo-Kconfig.patch | 16 +++-------------
15 1 file changed, 3 insertions(+), 13 deletions(-)
16
17 diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch
18 index 95a64aa2..05570254 100644
19 --- a/4567_distro-Gentoo-Kconfig.patch
20 +++ b/4567_distro-Gentoo-Kconfig.patch
21 @@ -290,19 +290,9 @@
22 + See the settings that become available for more details and fine-tuning.
23 +
24 +endmenu
25 -diff --git a/security/Kconfig b/security/Kconfig
26 -index 7561f6f99..01f0bf73f 100644
27 ---- a/security/Kconfig
28 -+++ b/security/Kconfig
29 -@@ -166,6 +166,7 @@ config HARDENED_USERCOPY
30 - config HARDENED_USERCOPY_FALLBACK
31 - bool "Allow usercopy whitelist violations to fallback to object size"
32 - depends on HARDENED_USERCOPY
33 -+ depends on !GENTOO_KERNEL_SELF_PROTECTION
34 - default y
35 - help
36 - This is a temporary option that allows missing usercopy whitelists
37 -@@ -181,6 +182,7 @@ config HARDENED_USERCOPY_PAGESPAN
38 +--- a/security/Kconfig 2021-12-05 18:20:55.655677710 -0500
39 ++++ b/security/Kconfig 2021-12-05 18:23:42.404251618 -0500
40 +@@ -167,6 +167,7 @@ config HARDENED_USERCOPY_PAGESPAN
41 bool "Refuse to copy allocations that span multiple pages"
42 depends on HARDENED_USERCOPY
43 depends on EXPERT