# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1195753491 0
# Node ID ae087a0fa2c929842293b5c26dcd6acb9bdd748d
# Parent  d3041196ae69e8ea8cc9adde3a2e866d23ab30f4
acm: Fix an exit label.

Jump to a different error exit label if error occurs early in the
policy update process.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>

diff -r d3041196ae69 -r ae087a0fa2c9 xen/xsm/acm/acm_policy.c
--- a/xen/xsm/acm/acm_policy.c	Thu Nov 22 17:43:29 2007 +0000
+++ b/xen/xsm/acm/acm_policy.c	Thu Nov 22 17:44:51 2007 +0000
@@ -104,7 +104,7 @@ static int
     /* if ssidrefs are to be deleted, make sure no domain is using them */
     if ( deletions != NULL )
         if ( acm_check_deleted_ssidrefs(deletions, errors) )
-            goto error_lock_free;
+            goto error_lock_free_nossidchange;
 
     if ( (ssidchanges != NULL) && (ssidchanges->num_items > 0) )
         /* assign all running domains new ssidrefs as requested */
@@ -169,6 +169,7 @@ error_lock_free:
     {
         acm_doms_restore_ssidref();
     }
+error_lock_free_nossidchange:
     do_chwall_init_state_curr(NULL);
     write_unlock(&acm_bin_pol_rwlock);