Hello community,

here is the log from the commit of package libvirt for openSUSE:Factory checked 
in at 2013-07-30 11:41:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
 and      /work/SRC/openSUSE:Factory/.libvirt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libvirt"

Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes  2013-07-25 
14:34:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes     2013-07-30 
11:41:56.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jul 22 17:17:42 MDT 2013 - jfeh...@suse.com
+
+- Unlock the storage volume object after looking it up
+  fe89fd3b-storage-pool-deadlock.patch
+  rhb#980676
+
+-------------------------------------------------------------------

New:
----
  fe89fd3b-storage-pool-deadlock.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.ZqF5lc/_old  2013-07-30 11:41:57.000000000 +0200
+++ /var/tmp/diff_new_pack.ZqF5lc/_new  2013-07-30 11:41:57.000000000 +0200
@@ -408,6 +408,7 @@
 Patch1:         fd2e3c4c-xen-sysctl-domctl.patch
 Patch2:         dfc69235-CVE-2013-4153.patch
 Patch3:         96518d43-CVE-2013-4154.patch
+Patch4:         fe89fd3b-storage-pool-deadlock.patch
 # Need to go upstream
 Patch100:       xen-name-for-devid.patch
 Patch101:       clone.patch
@@ -911,6 +912,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch100 -p1
 %patch101
 %patch102 -p1

++++++ fe89fd3b-storage-pool-deadlock.patch ++++++
commit fe89fd3b4071242ce9bbae6e1178fee30dc2f4f9
Author: Ján Tomko <jto...@redhat.com>
Date:   Thu Jul 4 14:41:46 2013 +0200

    Unlock the storage volume object after looking it up
    
    Introduced by c930410.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=980676

Index: libvirt-1.1.0/src/storage/storage_driver.c
===================================================================
--- libvirt-1.1.0.orig/src/storage/storage_driver.c
+++ libvirt-1.1.0/src/storage/storage_driver.c
@@ -1361,15 +1361,16 @@ storageVolLookupByKey(virConnectPtr conn
                 virStorageVolDefFindByKey(driver->pools.objs[i], key);
 
             if (vol) {
-                if (virStorageVolLookupByKeyEnsureACL(conn, 
driver->pools.objs[i]->def, vol) < 0)
+                if (virStorageVolLookupByKeyEnsureACL(conn, 
driver->pools.objs[i]->def, vol) < 0) {
+                    virStoragePoolObjUnlock(driver->pools.objs[i]);
                     goto cleanup;
+                }
 
                 ret = virGetStorageVol(conn,
                                        driver->pools.objs[i]->def->name,
                                        vol->name,
                                        vol->key,
                                        NULL, NULL);
-                goto cleanup;
             }
         }
         virStoragePoolObjUnlock(driver->pools.objs[i]);
@@ -1421,15 +1422,16 @@ storageVolLookupByPath(virConnectPtr con
             VIR_FREE(stable_path);
 
             if (vol) {
-                if (virStorageVolLookupByPathEnsureACL(conn, 
driver->pools.objs[i]->def, vol) < 0)
+                if (virStorageVolLookupByPathEnsureACL(conn, 
driver->pools.objs[i]->def, vol) < 0) {
+                    virStoragePoolObjUnlock(driver->pools.objs[i]);
                     goto cleanup;
+                }
 
                 ret = virGetStorageVol(conn,
                                        driver->pools.objs[i]->def->name,
                                        vol->name,
                                        vol->key,
                                        NULL, NULL);
-                goto cleanup;
             }
         }
         virStoragePoolObjUnlock(driver->pools.objs[i]);
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to