projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eb7d389
)
x86/mm: Do verify W^X at boot up
author
Peter Zijlstra
<peterz@infradead.org>
Tue, 25 Oct 2022 19:39:43 +0000
(21:39 +0200)
committer
Dave Hansen
<dave.hansen@linux.intel.com>
Thu, 15 Dec 2022 18:37:26 +0000
(10:37 -0800)
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
arch/x86/mm/pat/set_memory.c
patch
|
blob
|
history
diff --git
a/arch/x86/mm/pat/set_memory.c
b/arch/x86/mm/pat/set_memory.c
index 2e5a045731dec224e5114f4688ee908bbd9cc778..97342c42dda8e3de10d95224013dc7b288e0cd2d 100644
(file)
--- 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