x86/mm: PV superpage handling lacks sanity checks MMUEXT_{,UN}MARK_SUPER fail to check the input MFN for validity before dereferencing pointers into the superpage frame table. get_superpage() has a similar issue. This is XSA-167. Reported-by: Qinghao Tang Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2566,6 +2566,9 @@ int get_superpage(unsigned long mfn, str ASSERT(opt_allow_superpage); + if ( !mfn_valid(mfn | (L1_PAGETABLE_ENTRIES - 1)) ) + return -EINVAL; + spage = mfn_to_spage(mfn); y = spage->type_info; do { @@ -3320,14 +3323,6 @@ long do_mmuext_op( unsigned long mfn; struct spage_info *spage; - mfn = op.arg1.mfn; - if ( mfn & (L1_PAGETABLE_ENTRIES-1) ) - { - MEM_LOG("Unaligned superpage reference mfn %lx", mfn); - okay = 0; - break; - } - if ( !opt_allow_superpage ) { MEM_LOG("Superpages disallowed"); @@ -3336,16 +3331,6 @@ long do_mmuext_op( break; } - spage = mfn_to_spage(mfn); - okay = (mark_superpage(spage, d) >= 0); - break; - } - - case MMUEXT_UNMARK_SUPER: - { - unsigned long mfn; - struct spage_info *spage; - mfn = op.arg1.mfn; if ( mfn & (L1_PAGETABLE_ENTRIES-1) ) { @@ -3354,16 +3339,16 @@ long do_mmuext_op( break; } - if ( !opt_allow_superpage ) + if ( !mfn_valid(mfn | (L1_PAGETABLE_ENTRIES - 1)) ) { - MEM_LOG("Superpages disallowed"); okay = 0; - rc = -ENOSYS; break; } spage = mfn_to_spage(mfn); - okay = (unmark_superpage(spage) >= 0); + okay = ((op.cmd == MMUEXT_MARK_SUPER + ? mark_superpage(spage, d) + : unmark_superpage(spage)) >= 0); break; }