]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
storage: Handle failure from refreshVol
authorJohn Ferlan <jferlan@redhat.com>
Mon, 24 Aug 2015 16:38:13 +0000 (12:38 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 2 Sep 2015 17:11:40 +0000 (13:11 -0400)
Commit id '155ca616' added the 'refreshVol' API. In an NFS root-squash
environment it was possible that if the just created volume from XML wasn't
properly created with the right uid/gid and/or mode, then the followup
refreshVol will fail to open the volume in order to get the allocation/
capacity values. This would leave the volume still on the server and
cause a libvirtd crash because 'voldef' would be in the pool list, but
the cleanup code would free it.

src/storage/storage_driver.c

index b95506faf594afbd2db2d1bcdcc81041f20dcd70..6dfc16c2cf8a15bc53f9a9532aa111a7b8929944 100644 (file)
@@ -1734,8 +1734,12 @@ storageVolCreateXML(virStoragePoolPtr obj,
     }
 
     if (backend->refreshVol &&
-        backend->refreshVol(obj->conn, pool, voldef) < 0)
+        backend->refreshVol(obj->conn, pool, voldef) < 0) {
+        storageVolDeleteInternal(volobj, backend, pool, voldef,
+                                 0, false);
+        voldef = NULL;
         goto cleanup;
+    }
 
     /* Update pool metadata */
     pool->def->allocation += buildvoldef->target.allocation;