x86/xen: fix upper bound of pmd loop in xen_cleanhighmap()
authorJuergen Gross <jgross@suse.com>
Thu, 23 Jun 2016 05:12:27 +0000 (07:12 +0200)
committerDavid Vrabel <david.vrabel@citrix.com>
Thu, 23 Jun 2016 10:36:15 +0000 (11:36 +0100)
xen_cleanhighmap() is operating on level2_kernel_pgt only. The upper
bound of the loop setting non-kernel-image entries to zero should not
exceed the size of level2_kernel_pgt.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
arch/x86/xen/mmu.c

index 478a2de543a59ea797515be2f8145a503277778f..2693b7ed5a6f9825dcca43a6afccf808e6407e56 100644 (file)
@@ -1113,7 +1113,7 @@ static void __init xen_cleanhighmap(unsigned long vaddr,
 
        /* NOTE: The loop is more greedy than the cleanup_highmap variant.
         * We include the PMD passed in on _both_ boundaries. */
-       for (; vaddr <= vaddr_end && (pmd < (level2_kernel_pgt + PAGE_SIZE));
+       for (; vaddr <= vaddr_end && (pmd < (level2_kernel_pgt + PTRS_PER_PMD));
                        pmd++, vaddr += PMD_SIZE) {
                if (pmd_none(*pmd))
                        continue;