From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 14 Aug 2012 08:28:14 +0000 (+0200)
Subject: x86/PoD: fix (un)locking after 24772:28edc2b31a9b
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8055
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6e71854c324b7284e5ab2796f7de2ff3720840b9;p=xen.git

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>
---

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;