lkml.org 
[lkml]   [2022]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/mm] x86/mm: Do verify W^X at boot up
    The following commit has been merged into the x86/mm branch of tip:

    Commit-ID: 237c7e967566ca7048fd7e74951fccb026f92df0
    Gitweb: https://git.kernel.org/tip/237c7e967566ca7048fd7e74951fccb026f92df0
    Author: Peter Zijlstra <peterz@infradead.org>
    AuthorDate: Tue, 25 Oct 2022 21:39:43 +02:00
    Committer: Peter Zijlstra <peterz@infradead.org>
    CommitterDate: Tue, 01 Nov 2022 13:43:58 +01:00

    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
    ---
    arch/x86/mm/pat/set_memory.c | 4 ----
    1 file changed, 4 deletions(-)

    diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c
    index 2e5a045..97342c4 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
    \
     
     \ /
      Last update: 2022-11-02 10:15    [W:2.553 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site