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