aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2012-08-14 10:28:14 +0200
committerJan Beulich <jbeulich@suse.com>2012-08-14 10:28:14 +0200
commit6e71854c324b7284e5ab2796f7de2ff3720840b9 (patch)
treee877996b253cf239c266d7438ef2ce910a0ea9cd
parent38ce7ce35a667e7382da8b74c245b6cbf7ad7c5b (diff)
downloadxen-6e71854c324b7284e5ab2796f7de2ff3720840b9.tar.gz
xen-6e71854c324b7284e5ab2796f7de2ff3720840b9.tar.bz2
xen-6e71854c324b7284e5ab2796f7de2ff3720840b9.zip
x86/PoD: fix (un)locking after 24772:28edc2b31a9b
That c/s introduced a double unlock on the out-of-memory error path of p2m_pod_demand_populate(). Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: George Dunlap <george.dunlap@eu.citrix.com> Acked-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
-rw-r--r--xen/arch/x86/mm/p2m-pod.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c
index f6a7cdfa17..54da9f653a 100644
--- a/xen/arch/x86/mm/p2m-pod.c
+++ b/xen/arch/x86/mm/p2m-pod.c
@@ -1075,6 +1075,7 @@ out_of_memory:
printk("%s: Out of populate-on-demand memory! tot_pages %" PRIu32 " pod_entries %" PRIi32 "\n",
__func__, d->tot_pages, p2m->pod.entry_count);
domain_crash(d);
+ return -1;
out_fail:
pod_unlock(p2m);
return -1;