x86/PoD: fix (un)locking after 24772:28edc2b31a9b
authorJan Beulich <jbeulich@suse.com>
Tue, 14 Aug 2012 08:28:14 +0000 (10:28 +0200)
committerJan Beulich <jbeulich@suse.com>
Tue, 14 Aug 2012 08:28:14 +0000 (10:28 +0200)
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>
xen/arch/x86/mm/p2m-pod.c

index f6a7cdfa17bdfb8402748d6f29f1620d182d6688..54da9f653a06f881a44cf4012f30a6e265706566 100644 (file)
@@ -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;