Skip to contentSkip to conversation

x86-disable-execmem_rox-support.patch removed from -mm tree

merged Andrew Morton 1 participant 1 message Jan 15, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: x86: disable EXECMEM_ROX support
has been removed from the -mm tree. Its filename was
x86-disable-execmem_rox-support.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Peter Zijlstra <[email protected]>
Subject: x86: disable EXECMEM_ROX support
Date: Mon, 13 Jan 2025 12:29:34 +0100

module_writable_address() made a mess of alternative.c, and it still contains bugs -- notably some of the CFI variants crash and burn.

Mike has been working on patches to clean all this up again, but given the current state of things, this stuff just isn't ready.

Disable for now, lets try again next cycle.

Fixes 5185e7f9f3bd ("x86/module: enable ROX caches for module text on 64 bit")
Cc Borislav Petkov <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Ingo Molnar <[email protected]>

---

 arch/x86/Kconfig |    1 -
 1 file changed, 1 deletion(-)
arch/x86/Kconfig renamed from arch/x86/Kconfig~x86-disable-execmem_rox-support +0 -1
@@ -83,7 +83,6 @@ 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_FAST_MULTIPLIER
 	select ARCH_HAS_FORTIFY_SOURCE
 	select ARCH_HAS_GCOV_PROFILE_ALL

_

Patches currently in -mm which might be from [email protected] are