proj/linux-patches:master commit in: /

commit:     684d963325d506dd1b4ebf8da3cfdbcb1f1bad9b
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  7 16:12:48 2026 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Aug  7 16:12:48 2026 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=684d9633

fix for KSPP patch

Bug: https://bugs.gentoo.org/980301

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 4567_distro-Gentoo-Kconfig.patch | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/4567_distro-Gentoo-Kconfig.patch b/4567_distro-Gentoo-Kconfig.patch
index 23f598ed..043209a0 100644
--- a/4567_distro-Gentoo-Kconfig.patch
+++ b/4567_distro-Gentoo-Kconfig.patch
@@ -1,16 +1,14 @@
-diff --git a/Kconfig b/Kconfig
-index 307e58114..91aa4be3d 100644
---- a/Kconfig
-+++ b/Kconfig
+--- a/Kconfig	2026-08-04 07:16:59.780069213 -0400
++++ b/Kconfig	2026-08-04 07:19:56.603468453 -0400
 @@ -32,3 +32,5 @@ source "lib/Kconfig.debug"
  source "Documentation/Kconfig"
  
  source "io_uring/Kconfig"
 +
 +source "distro/Kconfig"
---- /dev/null	2026-05-07 13:22:28.820727378 -0400
-+++ b/distro/Kconfig	2026-05-07 14:40:00.105078860 -0400
-@@ -0,0 +1,307 @@
+--- /dev/null	2026-08-04 06:37:40.761684417 -0400
++++ b/distro/Kconfig	2026-08-04 08:02:22.140002199 -0400
+@@ -0,0 +1,306 @@
 +menu "Gentoo Linux"
 +
 +config GENTOO_LINUX
@@ -184,7 +182,7 @@ index 307e58114..91aa4be3d 100644
 +config GENTOO_KERNEL_SELF_PROTECTION_COMMON
 +	bool "Enable Kernel Self Protection Project Recommendations"
 +
-+	depends on GENTOO_LINUX && !SLAB_MERGE_DEFAULT && !SLUB_TINY && !COMPAT_BRK && !PROC_KCORE && !COMPAT_VDSO && !KEXEC && !HIBERNATION && !LEGACY_PTYS && !X86_X32_ABI && !MODIFY_LDT_SYSCALL && GCC_PLUGINS && IOMMU_DEFAULT_DMA_STRICT && SECURITY
++	depends on GENTOO_LINUX && !SLAB_MERGE_DEFAULT && !SLUB_TINY && !COMPAT_BRK && !PROC_KCORE && !COMPAT_VDSO && !KEXEC && !HIBERNATION && !LEGACY_PTYS && !X86_X32_ABI && !MODIFY_LDT_SYSCALL && GCC_PLUGINS && SECURITY
 +
 +	select BUG
 +	select STRICT_KERNEL_RWX
@@ -243,7 +241,7 @@ index 307e58114..91aa4be3d 100644
 +config GENTOO_KERNEL_SELF_PROTECTION_X86_64
 +	bool "X86_64 KSPP Settings" if GENTOO_KERNEL_SELF_PROTECTION_COMMON
 +
-+	depends on !X86_MSR && X86_64 && GENTOO_KERNEL_SELF_PROTECTION
++	depends on !X86_MSR && IOMMU_DEFAULT_DMA_STRICT && X86_64 && GENTOO_KERNEL_SELF_PROTECTION
 +	default n
 +	
 +	select KSTACK_ERASE if HAVE_ARCH_KSTACK_ERASE
@@ -260,7 +258,7 @@ index 307e58114..91aa4be3d 100644
 +config GENTOO_KERNEL_SELF_PROTECTION_ARM64
 +	bool "ARM64 KSPP Settings"
 +
-+	depends on ARM64
++	depends on IOMMU_DEFAULT_DMA_STRICT && ARM64
 +	default n
 +
 +	select ARM64_BTI
@@ -283,11 +281,10 @@ index 307e58114..91aa4be3d 100644
 +config GENTOO_KERNEL_SELF_PROTECTION_X86_32
 +	bool "X86_32 KSPP Settings"
 +
-+	depends on !X86_MSR && !MODIFY_LDT_SYSCALL && !M486 && X86_32
++	depends on X86_32 && !X86_MSR && !MODIFY_LDT_SYSCALL && !M486 && IOMMU_DEFAULT_DMA_STRICT && X86_PAE
 +	default n
 +
 +	select HIGHMEM64G
-+	select X86_PAE
 +	select RANDOMIZE_BASE
 +	select RELOCATABLE
 +	select PAGE_TABLE_ISOLATION
@@ -295,7 +292,7 @@ index 307e58114..91aa4be3d 100644
 +config GENTOO_KERNEL_SELF_PROTECTION_ARM
 +	bool "ARM KSPP Settings"
 +
-+	depends on !OABI_COMPAT && ARM
++	depends on !OABI_COMPAT && IOMMU_DEFAULT_DMA_STRICT && ARM
 +	default n
 +
 +	select VMSPLIT_3G
@@ -318,11 +315,9 @@ index 307e58114..91aa4be3d 100644
 +		See the settings that become available for more details and fine-tuning.
 +
 +endmenu
-diff --git a/mm/Kconfig b/mm/Kconfig
-index e443fe8cd..cefe9f0cf 100644
---- a/mm/Kconfig
-+++ b/mm/Kconfig
-@@ -753,6 +753,8 @@ config KSM
+--- a/mm/Kconfig	2026-08-04 07:18:31.058970855 -0400
++++ b/mm/Kconfig	2026-08-04 07:53:08.052753718 -0400
+@@ -702,6 +702,8 @@ config KSM
  config DEFAULT_MMAP_MIN_ADDR
  	int "Low address space to protect from user allocation"
  	depends on MMU
@@ -331,6 +326,3 @@ index e443fe8cd..cefe9f0cf 100644
  	default 4096
  	help
  	  This is the portion of low virtual memory which should be protected
--- 
-2.51.0
-