[Xen-changelog] [xen-3.1-testing] [XEN] Shadow: fix locking in error path.

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1191837584 -3600
# Node ID 14493058723aef48ac97e4ffd8e38ff3daf0fb2b
# Parent  2e23ac5dd52983c83657d40afc44e8512dc8109a
[XEN] Shadow: fix locking in error path.
Signed-off-by: TIm Deegan <Tim.Deegan@xxxxxxxxxxxxx>
xen-unstable changeset:   16076:0c2535407828d6473a2b5730155c66e76f9a0512
xen-unstable date:        Mon Oct 08 09:40:49 2007 +0100
---
 xen/arch/x86/mm/shadow/common.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 2e23ac5dd529 -r 14493058723a xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c   Wed Oct 03 14:44:11 2007 +0100
+++ b/xen/arch/x86/mm/shadow/common.c   Mon Oct 08 10:59:44 2007 +0100
@@ -2451,13 +2451,13 @@ int shadow_enable(struct domain *d, u32 
         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 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog