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 <mihai.carabas@oracle.com>
Reviewed-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 7a2b068e7db304984bf02c758c2b62f393d5f116..7869b09d4d1a57ea0301b963b410ea7381160fba 100644 (file)
--- 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;