Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:5.10 commit in: /
Date: Thu, 08 Jul 2021 12:27:23
Message-Id: 1625747189.fafbdba1d0c62ba216f0cdbd963cad7c4a9ee612.mpagano@gentoo
1 commit: fafbdba1d0c62ba216f0cdbd963cad7c4a9ee612
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 8 12:26:29 2021 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 8 12:26:29 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=fafbdba1
7
8 KSPP:Fix DEVMEM Select and move help text
9
10 Bug: https://bugs.gentoo.org/798315
11
12 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
13
14 4567_distro-Gentoo-Kconfig.patch | 26 +++++++++++++-------------
15 1 file changed, 13 insertions(+), 13 deletions(-)
16
17 diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch
18 index b671313..c063c6d 100644
19 --- a/4567_distro-Gentoo-Kconfig.patch
20 +++ b/4567_distro-Gentoo-Kconfig.patch
21 @@ -6,8 +6,8 @@
22 source "Documentation/Kconfig"
23 +
24 +source "distro/Kconfig"
25 ---- /dev/null 2021-06-08 16:56:49.698138501 -0400
26 -+++ b/distro/Kconfig 2021-06-08 17:11:33.377999003 -0400
27 +--- /dev/null 2021-07-04 10:53:51.006624416 -0400
28 ++++ b/distro/Kconfig 2021-07-04 11:07:33.534248860 -0400
29 @@ -0,0 +1,263 @@
30 +menu "Gentoo Linux"
31 +
32 @@ -172,15 +172,6 @@
33 +config GENTOO_KERNEL_SELF_PROTECTION
34 + bool "Architecture Independant Kernel Self Protection Project Recommendations"
35 +
36 -+ help
37 -+ Recommended Kernel settings based on the suggestions from the Kernel Self Protection Project
38 -+ See: https://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project/Recommended_Settings
39 -+ Note, there may be additional settings for which the CONFIG_ setting is invisible in menuconfig due
40 -+ to unmet dependencies. Search for GENTOO_KERNEL_SELF_PROTECTION_{X86_64, ARM64, X86_32, ARM} for
41 -+ dependency information on your specific architecture.
42 -+ Note 2: Please see the URL above for numeric settings, e.g. CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
43 -+ for X86_64
44 -+
45 + depends on GENTOO_LINUX && !ACPI_CUSTOM_METHOD && !COMPAT_BRK && !DEVKMEM && !PROC_KCORE && !COMPAT_VDSO && !KEXEC && !HIBERNATION && !LEGACY_PTYS && !X86_X32 && !MODIFY_LDT_SYSCALL
46 +
47 + select BUG
48 @@ -188,8 +179,8 @@
49 + select DEBUG_WX
50 + select STACKPROTECTOR
51 + select STACKPROTECTOR_STRONG
52 -+ select STRICT_DEVMEM
53 -+ select IO_STRICT_DEVMEM
54 ++ select STRICT_DEVMEM if DEVMEM=y
55 ++ select IO_STRICT_DEVMEM if DEVMEM=y
56 + select SYN_COOKIES
57 + select DEBUG_CREDENTIALS
58 + select DEBUG_NOTIFIERS
59 @@ -222,6 +213,15 @@
60 + select GCC_PLUGIN_RANDSTRUCT
61 + select GCC_PLUGIN_RANDSTRUCT_PERFORMANCE
62 +
63 ++ help
64 ++ Recommended Kernel settings based on the suggestions from the Kernel Self Protection Project
65 ++ See: https://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project/Recommended_Settings
66 ++ Note, there may be additional settings for which the CONFIG_ setting is invisible in menuconfig due
67 ++ to unmet dependencies. Search for GENTOO_KERNEL_SELF_PROTECTION_{X86_64, ARM64, X86_32, ARM} for
68 ++ dependency information on your specific architecture.
69 ++ Note 2: Please see the URL above for numeric settings, e.g. CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
70 ++ for X86_64
71 ++
72 +menu "Architecture Specific Self Protection Project Recommendations"
73 +
74 +config GENTOO_KERNEL_SELF_PROTECTION_X86_64