Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc71f393 authored by Michal Hocko's avatar Michal Hocko Committed by Greg Kroah-Hartman
Browse files

x86/speculation/l1tf: Fix up pte->pfn conversion for PAE 



commit e14d7dfb41f5807a0c1c26a13f2b8ef16af24935 upstream.

Jan has noticed that pte_pfn and co. resp. pfn_pte are incorrect for
CONFIG_PAE because phys_addr_t is wider than unsigned long and so the
pte_val reps. shift left would get truncated. Fix this up by using proper
types.

[Just one chunk, again, needed here.  Thanks to Ben and Guenter for
finding and fixing this. - gregkh]

Fixes: 6b28baca9b1f ("x86/speculation/l1tf: Protect PROT_NONE PTEs against speculation")
Reported-by: default avatarJan Beulich <JBeulich@suse.com>
Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66f5a871

arch/x86/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static inline pmd_t pfn_pmd(unsigned long page_nr, pgprot_t pgprot) 


static inline pud_t pfn_pud(unsigned long page_nr, pgprot_t pgprot)

{

	phys_addr_t pfn = page_nr << PAGE_SHIFT;

	phys_addr_t pfn = (phys_addr_t)page_nr << PAGE_SHIFT;

	pfn ^= protnone_mask(pgprot_val(pgprot));

	pfn &= PHYSICAL_PUD_PAGE_MASK;

	return __pud(pfn | massage_pgprot(pgprot));