From: Tim Deegan <Tim.Deegan@xensource.com>
Date: Mon, 8 Oct 2007 08:40:49 +0000 (+0100)
Subject: [XEN] Shadow: fix locking in error path.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14905
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c4cc67351030ce5a6c9150a4a59fccd147e8d477;p=xen.git

[XEN] Shadow: fix locking in error path.
Signed-off-by: TIm Deegan <Tim.Deegan@xensource.com>
---

diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index 04bc55deb4..97da7cf484 100644
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -2372,13 +2372,13 @@ int shadow_enable(struct domain *d, u32 mode)
         unsigned int r;
         shadow_lock(d);                
         r = sh_set_allocation(d, 256, NULL); /* Use at least 1MB */
-        shadow_unlock(d);
         if ( r != 0 )
         {
             sh_set_allocation(d, 0, NULL);
             rv = -ENOMEM;
-            goto out_unlocked;
+            goto out_locked;
         }        
+        shadow_unlock(d);
     }
 
     /* Init the P2M table.  Must be done before we take the shadow lock