Skip to content

Commit

Permalink
x86/speculation/l1tf: Invert all not present mappings
Browse files Browse the repository at this point in the history
commit f22cc87 upstream.

For kernel mappings PAGE_PROTNONE is not necessarily set for a non present
mapping, but the inversion logic explicitely checks for !PRESENT and
PROT_NONE.

Remove the PROT_NONE check and make the inversion unconditional for all not
present mappings.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Andi Kleen authored and Greg Kroah-Hartman committed Aug 15, 2018
1 parent 4d3579f commit 330e597
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/include/asm/pgtable-invert.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

static inline bool __pte_needs_invert(u64 val)
{
return (val & (_PAGE_PRESENT|_PAGE_PROTNONE)) == _PAGE_PROTNONE;
return !(val & _PAGE_PRESENT);
}

/* Get a mask to xor with the page table entry to get the correct pfn. */
Expand Down

0 comments on commit 330e597

Please sign in to comment.