diff mbox series

[5/5] x86/mm: Do verify W^X at boot up

Message ID 20221025201058.011279208@infradead.org
State New
Headers
Series x86/ftrace: Cure boot time W+X mapping |

Commit Message

Peter Zijlstra Oct. 25, 2022, 8:07 p.m. UTC 
  Straight up revert of commit:

  a970174d7a10 ("x86/mm: Do not verify W^X at boot up")

now that the root cause has been fixed.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
 arch/x86/mm/pat/set_memory.c |    4 ----
 1 file changed, 4 deletions(-)
diff mbox series

Patch

--- a/arch/x86/mm/pat/set_memory.c
+++ b/arch/x86/mm/pat/set_memory.c
@@ -587,10 +587,6 @@  static inline pgprot_t verify_rwx(pgprot
 {
 	unsigned long end;
 
-	/* Kernel text is rw at boot up */
-	if (system_state == SYSTEM_BOOTING)
-		return new;
-
 	/*
 	 * 32-bit has some unfixable W+X issues, like EFI code
 	 * and writeable data being in the same page.  Disable