diff options
| author | Mario Preksavec <mario@slackware.hr> | 2016-06-22 11:20:33 +0200 |
|---|---|---|
| committer | Mario Preksavec <mario@slackware.hr> | 2016-06-22 11:20:33 +0200 |
| commit | ddfad94dbb07881a143b97e017e7538fdaa794e4 (patch) | |
| tree | befdcef93b2c77dbf84f119646024509a1a06f34 /system/xen/patches/xsa181.patch | |
| parent | a353544aa726d1adb443cfa5bc28ae5ce1d37441 (diff) | |
| download | slackbuilds-ddfad94dbb07881a143b97e017e7538fdaa794e4.tar.gz | |
system/xen: Updated for version 4.6.1.
Signed-off-by: Mario Preksavec <mario@slackware.hr>
Diffstat (limited to 'system/xen/patches/xsa181.patch')
| -rw-r--r-- | system/xen/patches/xsa181.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/system/xen/patches/xsa181.patch b/system/xen/patches/xsa181.patch new file mode 100644 index 0000000000..c44541ec4d --- /dev/null +++ b/system/xen/patches/xsa181.patch @@ -0,0 +1,38 @@ +From ee488e2133e581967d13d5287d7bd654e9b2e2a6 Mon Sep 17 00:00:00 2001 +From: Andrew Cooper <andrew.cooper3@citrix.com> +Date: Thu, 2 Jun 2016 14:19:00 +0100 +Subject: [PATCH] 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@dornerworks.com> +Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Julien Grall <julien.grall@arm.com> +--- + 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; + +-- +2.1.4 + |