From: Mihai Carabas Date: Mon, 13 Aug 2018 18:54:27 +0000 (+0300) Subject: x86/mm/pageattr.c: fix page prot mask X-Git-Tag: v4.1.12-124.31.3~587 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0b37b2d5fac620946947f5b25b1dec493c55e453;p=users%2Fjedix%2Flinux-maple.git x86/mm/pageattr.c: fix page prot mask Fixes commit ffbd3f4c16eb68d6190959e5388ef2896b2e881c (x86/mm/pat: Make set_memory_np() L1TF safe). Missed canon_pgprot on pud_pgprot. Orabug: 28492122 Signed-off-by: Mihai Carabas Reviewed-by: Dhaval Giani --- diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 7a2b068e7db3..7869b09d4d1a 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -1051,7 +1051,7 @@ static int populate_pud(struct cpa_data *cpa, unsigned long start, pgd_t *pgd, pfn ^= protnone_mask(pgprot_val(canon_pgprot(pud_pgprot))); pfn &= ((((signed long)PUD_PAGE_MASK) & __PHYSICAL_MASK)); - pudval_t v = native_pud_val(__pud(pfn | massage_pgprot(pud_pgprot))); + pudval_t v = native_pud_val(__pud(pfn | massage_pgprot(canon_pgprot(pud_pgprot)))); set_pud(pud, native_make_pud(v | _PAGE_PSE)); start += PUD_SIZE;