Commit fb43d6cb authored by Dave Hansen's avatar Dave Hansen Committed by Ingo Molnar
Browse files

x86/mm: Do not auto-massage page protections 



A PTE is constructed from a physical address and a pgprotval_t.
__PAGE_KERNEL, for instance, is a pgprot_t and must be converted
into a pgprotval_t before it can be used to create a PTE.  This is
done implicitly within functions like pfn_pte() by massage_pgprot().

However, this makes it very challenging to set bits (and keep them
set) if your bit is being filtered out by massage_pgprot().

This moves the bit filtering out of pfn_pte() and friends.  For
users of PAGE_KERNEL*, filtering will be done automatically inside
those macros but for users of __PAGE_KERNEL*, they need to do their
own filtering now.

Note that we also just move pfn_pte/pmd/pud() over to check_pgprot()
instead of massage_pgprot().  This way, we still *look* for
unsupported bits and properly warn about them if we find them.  This
might happen if an unfiltered __PAGE_KERNEL* value was passed in,
for instance.

- printk format warning fix from: Arnd Bergmann <arnd@arndb.de>
- boot crash fix from:            Tom Lendacky <thomas.lendacky@amd.com>
- crash bisected by:              Mike Galbraith <efault@gmx.de>

Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Reported-and-fixed-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixed-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Bisected-by: default avatarMike Galbraith <efault@gmx.de>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Kees Cook <keescook@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Nadav Amit <namit@vmware.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20180406205509.77E1D7F6@viggo.jf.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 6baf4bec

arch/x86/boot/compressed/kaslr.c

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ unsigned int ptrs_per_p4d __ro_after_init = 1; 


extern unsigned long get_cmd_line_ptr(void);



/* Used by PAGE_KERN* macros: */

pteval_t __default_kernel_pte_mask __read_mostly = ~0;



/* Simplified build-specific string for starting entropy. */

static const char build_str[] = UTS_RELEASE " (" LINUX_COMPILE_BY "@"

		LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION;

arch/x86/include/asm/pgtable.h

+22 −5
Original line number Diff line number Diff line
@@ -526,22 +526,39 @@ static inline pgprotval_t massage_pgprot(pgprot_t pgprot) 
	return protval;

}



static inline pgprotval_t check_pgprot(pgprot_t pgprot)

{

	pgprotval_t massaged_val = massage_pgprot(pgprot);



	/* mmdebug.h can not be included here because of dependencies */

#ifdef CONFIG_DEBUG_VM

	WARN_ONCE(pgprot_val(pgprot) != massaged_val,

		  "attempted to set unsupported pgprot: %016llx "

		  "bits: %016llx supported: %016llx\n",

		  (u64)pgprot_val(pgprot),

		  (u64)pgprot_val(pgprot) ^ massaged_val,

		  (u64)__supported_pte_mask);

#endif



	return massaged_val;

}



static inline pte_t pfn_pte(unsigned long page_nr, pgprot_t pgprot)

{

	return __pte(((phys_addr_t)page_nr << PAGE_SHIFT) |

		     massage_pgprot(pgprot));

		     check_pgprot(pgprot));

}



static inline pmd_t pfn_pmd(unsigned long page_nr, pgprot_t pgprot)

{

	return __pmd(((phys_addr_t)page_nr << PAGE_SHIFT) |

		     massage_pgprot(pgprot));

		     check_pgprot(pgprot));

}



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

{

	return __pud(((phys_addr_t)page_nr << PAGE_SHIFT) |

		     massage_pgprot(pgprot));

		     check_pgprot(pgprot));

}



static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
@@ -553,7 +570,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	 * the newprot (if present):

	 */

	val &= _PAGE_CHG_MASK;

	val |= massage_pgprot(newprot) & ~_PAGE_CHG_MASK;

	val |= check_pgprot(newprot) & ~_PAGE_CHG_MASK;



	return __pte(val);

}
@@ -563,7 +580,7 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot) 
	pmdval_t val = pmd_val(pmd);



	val &= _HPAGE_CHG_MASK;

	val |= massage_pgprot(newprot) & ~_HPAGE_CHG_MASK;

	val |= check_pgprot(newprot) & ~_HPAGE_CHG_MASK;



	return __pmd(val);

}

arch/x86/kernel/head64.c

+2 −0
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ unsigned long __head __startup_64(unsigned long physaddr, 
	pud[i + 1] = (pudval_t)pmd + pgtable_flags;



	pmd_entry = __PAGE_KERNEL_LARGE_EXEC & ~_PAGE_GLOBAL;

	/* Filter out unsupported __PAGE_KERNEL_* bits: */

	pmd_entry &= __supported_pte_mask;

	pmd_entry += sme_get_me_mask();

	pmd_entry +=  physaddr;

arch/x86/kernel/ldt.c

+5 −1
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot) 
		unsigned long offset = i << PAGE_SHIFT;

		const void *src = (char *)ldt->entries + offset;

		unsigned long pfn;

		pgprot_t pte_prot;

		pte_t pte, *ptep;



		va = (unsigned long)ldt_slot_va(slot) + offset;
@@ -163,7 +164,10 @@ map_ldt_struct(struct mm_struct *mm, struct ldt_struct *ldt, int slot) 
		 * target via some kernel interface which misses a

		 * permission check.

		 */

		pte = pfn_pte(pfn, __pgprot(__PAGE_KERNEL_RO & ~_PAGE_GLOBAL));

		pte_prot = __pgprot(__PAGE_KERNEL_RO & ~_PAGE_GLOBAL);

		/* Filter out unsuppored __PAGE_KERNEL* bits: */

		pgprot_val(pte_prot) |= __supported_pte_mask;

		pte = pfn_pte(pfn, pte_prot);

		set_pte_at(mm, va, ptep, pte);

		pte_unmap_unlock(ptep, ptl);

	}

arch/x86/mm/ident_map.c

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page, 
	if (!info->kernpg_flag)

		info->kernpg_flag = _KERNPG_TABLE;



	/* Filter out unsupported __PAGE_KERNEL_* bits: */

	info->kernpg_flag &= __default_kernel_pte_mask;



	for (; addr < end; addr = next) {

		pgd_t *pgd = pgd_page + pgd_index(addr);

		p4d_t *p4d;

CRA Git | Maintained and supported by SUSTech CRA and CCSE