From: "Mike Pagano" <mpagano@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/linux-patches:master commit in: /
Date: Tue, 8 Jun 2021 22:14:54 +0000 (UTC) [thread overview]
Message-ID: <1623190440.ccf130a6c7afbb4715ba52fd6e34b7fb25d1c0fb.mpagano@gentoo> (raw)
commit: ccf130a6c7afbb4715ba52fd6e34b7fb25d1c0fb
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 8 22:14:00 2021 +0000
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Tue Jun 8 22:14:00 2021 +0000
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=ccf130a6
Updates from gyakovlev
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
4567_distro-Gentoo-Kconfig.patch | 72 +++++++++++++++++++++++++++++++++++-----
1 file changed, 64 insertions(+), 8 deletions(-)
diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch
index 56adbbd..635de00 100644
--- a/4567_distro-Gentoo-Kconfig.patch
+++ b/4567_distro-Gentoo-Kconfig.patch
@@ -6,9 +6,9 @@
source "Documentation/Kconfig"
+
+source "distro/Kconfig"
---- /dev/null 2021-06-06 14:01:09.950742356 -0400
-+++ b/distro/Kconfig 2021-06-06 17:48:05.912077568 -0400
-@@ -0,0 +1,267 @@
+--- /dev/null 2021-06-08 16:56:49.698138501 -0400
++++ b/distro/Kconfig 2021-06-08 17:11:33.377999003 -0400
+@@ -0,0 +1,263 @@
+menu "Gentoo Linux"
+
+config GENTOO_LINUX
@@ -181,8 +181,7 @@
+ Note 2: Please see the URL above for numeric settings, e.g. CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+ for X86_64
+
-+ depends on GENTOO_LINUX && !HARDENED_USERCOPY_FALLBACK && !HARDENED_USERCOPY_PAGESPAN && !ACPI_CUSTOM_METHOD && !COMPAT_BRK && !DEVKMEM && !PROC_KCORE && !COMPAT_VDSO && !KEXEC && !HIBERNATION && !LEGACY_PTYS && !SECURITY_SELINUX_DISABLE && !X86_X32 && !MODIFY_LDT_SYSCALL
-+
++ depends on GENTOO_LINUX && !ACPI_CUSTOM_METHOD && !COMPAT_BRK && !DEVKMEM && !PROC_KCORE && !COMPAT_VDSO && !KEXEC && !HIBERNATION && !LEGACY_PTYS && !X86_X32 && !MODIFY_LDT_SYSCALL
+
+ select BUG
+ select STRICT_KERNEL_RWX
@@ -191,7 +190,6 @@
+ select STACKPROTECTOR_STRONG
+ select STRICT_DEVMEM
+ select IO_STRICT_DEVMEM
-+
+ select SYN_COOKIES
+ select DEBUG_CREDENTIALS
+ select DEBUG_NOTIFIERS
@@ -201,9 +199,7 @@
+ select SCHED_STACK_END_CHECK
+ select SECCOMP
+ select SECCOMP_FILTER
-+ select SECURITY
+ select SECURITY_YAMA
-+ select HARDENED_USERCOPY
+ select SLAB_FREELIST_RANDOM
+ select SLAB_FREELIST_HARDENED
+ select SHUFFLE_PAGE_ALLOCATOR
@@ -276,3 +272,63 @@
+endmenu
+
+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
+ bool "Refuse to copy allocations that span multiple pages"
+ depends on HARDENED_USERCOPY
+ depends on EXPERT
++ depends on !GENTOO_KERNEL_SELF_PROTECTION
+ help
+ When a multi-page allocation is done without __GFP_COMP,
+ hardened usercopy will reject attempts to copy it. There are,
+diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
+index 9e921fc72..f29bc13fa 100644
+--- a/security/selinux/Kconfig
++++ b/security/selinux/Kconfig
+@@ -26,6 +26,7 @@ config SECURITY_SELINUX_BOOTPARAM
+ config SECURITY_SELINUX_DISABLE
+ bool "NSA SELinux runtime disable"
+ depends on SECURITY_SELINUX
++ depends on !GENTOO_KERNEL_SELF_PROTECTION
+ select SECURITY_WRITABLE_HOOKS
+ default n
+ help
+--
+2.31.1
+
+From bd3ff0b16792c18c0614c2b95e148943209f460a Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 8 Jun 2021 13:59:57 -0700
+Subject: [PATCH 2/2] set DEFAULT_MMAP_MIN_ADDR by default
+
+---
+ mm/Kconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mm/Kconfig b/mm/Kconfig
+index 24c045b24..e13fc740c 100644
+--- a/mm/Kconfig
++++ b/mm/Kconfig
+@@ -321,6 +321,8 @@ config KSM
+ config DEFAULT_MMAP_MIN_ADDR
+ int "Low address space to protect from user allocation"
+ depends on MMU
++ default 65536 if ( X86_64 || X86_32 || PPC64 || IA64 ) && GENTOO_KERNEL_SELF_PROTECTION
++ default 32768 if ( ARM64 || ARM ) && GENTOO_KERNEL_SELF_PROTECTION
+ default 4096
+ help
+ This is the portion of low virtual memory which should be protected
+--
+2.31.1
+```
next reply other threads:[~2021-06-08 22:14 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 22:14 Mike Pagano [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-05 17:54 [gentoo-commits] proj/linux-patches:master commit in: / Mike Pagano
2024-04-27 22:02 Mike Pagano
2023-10-05 14:05 Mike Pagano
2023-05-09 12:35 Mike Pagano
2023-03-21 12:59 Mike Pagano
2022-08-25 17:37 Mike Pagano
2022-06-27 19:22 Mike Pagano
2022-05-11 17:40 Mike Pagano
2022-04-25 16:15 Mike Pagano
2022-04-12 19:12 Mike Pagano
2022-04-12 17:39 Mike Pagano
2022-01-29 20:44 Mike Pagano
2022-01-09 20:04 Mike Pagano
2022-01-04 12:53 Mike Pagano
2021-12-21 19:28 Mike Pagano
2021-12-05 23:36 Mike Pagano
2021-10-18 21:16 Mike Pagano
2021-09-20 21:58 Mike Pagano
2021-08-25 16:21 Mike Pagano
2021-08-24 19:54 Mike Pagano
2021-08-09 23:18 Mike Pagano
2021-08-03 22:50 Mike Pagano
2021-08-03 11:02 Mike Pagano
2021-08-02 22:29 Mike Pagano
2021-07-04 15:17 Mike Pagano
2021-06-11 13:24 Mike Pagano
2021-06-08 20:08 Mike Pagano
2021-06-08 16:47 Mike Pagano
2021-06-08 15:37 Mike Pagano
2020-09-24 15:34 Mike Pagano
2020-09-24 15:17 Mike Pagano
2020-09-24 15:12 Mike Pagano
2020-05-13 11:57 Mike Pagano
2020-04-15 15:20 Mike Pagano
2019-12-30 22:24 Mike Pagano
2019-09-18 19:35 Mike Pagano
2019-08-07 12:39 Mike Pagano
2018-12-29 0:00 Mike Pagano
2018-09-28 12:15 Mike Pagano
2017-03-02 16:16 Mike Pagano
2017-02-18 20:36 Mike Pagano
2016-11-16 11:36 Mike Pagano
2016-11-07 0:09 Mike Pagano
2016-08-30 18:42 Mike Pagano
2016-07-01 23:48 Mike Pagano
2015-06-23 12:54 Mike Pagano
2015-06-23 12:54 Mike Pagano
2015-06-23 12:48 Mike Pagano
2015-06-23 12:48 Mike Pagano
2015-06-23 12:48 Mike Pagano
2015-06-20 17:36 [gentoo-commits] proj/linux-patches:4.0 " Mike Pagano
2015-06-23 12:48 ` [gentoo-commits] proj/linux-patches:master " Mike Pagano
2015-06-06 22:03 [gentoo-commits] proj/linux-patches:4.0 " Mike Pagano
2015-06-23 12:48 ` [gentoo-commits] proj/linux-patches:master " Mike Pagano
2015-05-17 19:55 [gentoo-commits] proj/linux-patches:4.0 " Mike Pagano
2015-06-23 12:48 ` [gentoo-commits] proj/linux-patches:master " Mike Pagano
2015-05-14 12:22 [gentoo-commits] proj/linux-patches:4.0 " Mike Pagano
2015-06-23 12:48 ` [gentoo-commits] proj/linux-patches:master " Mike Pagano
2015-05-07 19:37 [gentoo-commits] proj/linux-patches:4.0 " Mike Pagano
2015-06-23 12:48 ` [gentoo-commits] proj/linux-patches:master " Mike Pagano
2015-05-07 19:14 [gentoo-commits] proj/linux-patches:4.0 " Mike Pagano
2015-06-23 12:48 ` [gentoo-commits] proj/linux-patches:master " Mike Pagano
2015-05-03 23:55 [gentoo-commits] proj/linux-patches:4.0 " Mike Pagano
2015-06-23 12:48 ` [gentoo-commits] proj/linux-patches:master " Mike Pagano
2015-04-29 17:33 [gentoo-commits] proj/linux-patches:4.0 " Mike Pagano
2015-06-23 12:48 ` [gentoo-commits] proj/linux-patches:master " Mike Pagano
2015-03-21 20:00 [gentoo-commits] proj/linux-patches:4.0 " Mike Pagano
2015-06-23 12:48 ` [gentoo-commits] proj/linux-patches:master " Mike Pagano
2015-03-18 23:27 [gentoo-commits] proj/linux-patches:4.0 " Mike Pagano
2015-06-23 12:48 ` [gentoo-commits] proj/linux-patches:master " Mike Pagano
2014-10-07 1:43 Anthony G. Basile
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1623190440.ccf130a6c7afbb4715ba52fd6e34b7fb25d1c0fb.mpagano@gentoo \
--to=mpagano@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox