[Xen-changelog] [xen master] xen/arm: Don't free p2m->root in p2m_teardown() before it has been allocated

[patchbot@xxxxxxx]

commit 9ab1bd9ab64799816c8223a5f210b7a767ab4ccc
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Thu Jun 2 14:19:00 2016 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Jun 3 11:26:51 2016 +0100

    xen/arm: Don't free p2m->root in p2m_teardown() before it has been allocated
    
    If p2m_init() didn't complete successfully, (e.g. due to VMID
    exhaustion), p2m_teardown() is called and unconditionally tries to free
    p2m->root before it has been allocated.  free_domheap_pages() doesn't
    tolerate NULL pointers.
    
    This is XSA-181
    
    Reported-by: Aaron Cornelius <Aaron.Cornelius@xxxxxxxxxxxxxxx>
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Julien Grall <julien.grall@xxxxxxx>
---
 xen/arch/arm/p2m.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 838d004..6a19c57 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -1408,7 +1408,8 @@ void p2m_teardown(struct domain *d)
     while ( (pg = page_list_remove_head(&p2m->pages)) )
         free_domheap_page(pg);
 
-    free_domheap_pages(p2m->root, P2M_ROOT_ORDER);
+    if ( p2m->root )
+        free_domheap_pages(p2m->root, P2M_ROOT_ORDER);
 
     p2m->root = NULL;
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog