Commit 47410d83 authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by Peter Zijlstra
Browse files

x86/Kconfig: only enable ROX cache in execmem when STRICT_MODULE_RWX is set 



Currently ROX cache in execmem is enabled regardless of
STRICT_MODULE_RWX setting. This breaks an assumption that module memory
is writable when STRICT_MODULE_RWX is disabled, for instance for kernel
debuggin.

Only enable ROX cache in execmem when STRICT_MODULE_RWX is set to
restore the original behaviour of module text permissions.

Fixes: 64f6a4e1 ("x86: re-enable EXECMEM_ROX support")
Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20250603111446.2609381-3-rppt@kernel.org
parent 1dbf30fd

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ config X86 
	select ARCH_HAS_DMA_OPS			if GART_IOMMU || XEN

	select ARCH_HAS_EARLY_DEBUG		if KGDB

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_EXECMEM_ROX		if X86_64

	select ARCH_HAS_EXECMEM_ROX		if X86_64 && STRICT_MODULE_RWX

	select ARCH_HAS_FAST_MULTIPLIER

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL