[Xen-changelog] [xen stable-4.7] pvgrub: fix crash when booting kernel with p2m list outside kernel mapping

[patchbot@xxxxxxx]

commit 7a71cea02afe2bf0f04f1cbf91931081dbe9dd76
Author:     Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Tue Dec 13 14:25:52 2016 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Dec 13 14:25:52 2016 +0100

    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 <sven.koehler@xxxxxxxxx>
    Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    master commit: 9714f6b87e19b32d3a6663a20df6610265c4bfe5
    master date: 2016-09-28 11:29:28 +0100
---
 stubdom/grub/kexec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/stubdom/grub/kexec.c b/stubdom/grub/kexec.c
index 8fd9ff9..71c2f3f 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++)
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.7

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog