>From 62a69c20e2184a630efdaff87ddbb768d75c73be Mon Sep 17 00:00:00 2001 From: Juergen Gross Date: Tue, 27 Sep 2016 14:03:09 +0200 Subject: [PATCH] pvgrub: fix crash when booting kernel with p2m list outside kernel mapping When trying to boot a kernel with the p2m list not mapped by the initial kernel mapping it can happen that pvgrub is failing as it is keeping some page tables mapped. Unmap the additional page tables created for the special p2m mapping will avoid this failure. Reported-by: Sven Koehler Signed-off-by: Juergen Gross --- This is a backport candidate for 4.7 --- stubdom/grub/kexec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stubdom/grub/kexec.c b/stubdom/grub/kexec.c index 2ed4f6c..437a0a9 100644 --- a/stubdom/grub/kexec.c +++ b/stubdom/grub/kexec.c @@ -347,6 +347,8 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, char /* Unmap libxc's projection of the boot page table */ seg = xc_dom_seg_to_ptr(dom, &dom->pgtables_seg); munmap(seg, dom->pgtables_seg.vend - dom->pgtables_seg.vstart); + seg = xc_dom_seg_to_ptr(dom, &dom->p2m_seg); + munmap(seg, dom->p2m_seg.vend - dom->p2m_seg.vstart); /* Unmap day0 pages to avoid having a r/w mapping of the future page table */ for (pfn = 0; pfn < allocated; pfn++) -- 2.6.6