diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2022-10-25 21:39:43 +0200 |
|---|---|---|
| committer | Dave Hansen <dave.hansen@linux.intel.com> | 2022-12-15 19:37:26 +0100 |
| commit | 414ebf148cb5c5fa727ec51fdb69c4ab82dccf3b (patch) | |
| tree | c0c41d604c46ba3cbea06c35177e812bb2d7cadb | |
| parent | x86/ftrace: Remove SYSTEM_BOOTING exceptions (diff) | |
| download | linux-414ebf148cb5c5fa727ec51fdb69c4ab82dccf3b.tar.xz linux-414ebf148cb5c5fa727ec51fdb69c4ab82dccf3b.zip | |
x86/mm: Do verify W^X at boot up
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>
Link: https://lkml.kernel.org/r/20221025201058.011279208@infradead.org
| -rw-r--r-- | arch/x86/mm/pat/set_memory.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 2e5a045731de..97342c42dda8 100644 --- 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_t old, pgprot_t new, unsigned long star { 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 |