]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
storage: Prior to creating a volume, refresh the pool
authorJohn Ferlan <jferlan@redhat.com>
Wed, 30 Sep 2015 21:53:01 +0000 (17:53 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Mon, 5 Oct 2015 12:14:44 +0000 (08:14 -0400)
https://bugzilla.redhat.com/show_bug.cgi?id=1233003

Although perhaps bordering on a don't do that type scenario, if
someone creates a volume in a pool outside of libvirt, then uses that
same name to create a volume in the pool via libvirt, then the creation
will fail and in some cases cause the same name volume to be deleted.

This patch will refresh the pool just prior to checking whether the
named volume exists prior to creating the volume in the pool. While
it's still possible to have a timing window to create a file after the
check - at least we tried.  At that point, someone is being malicious.

src/storage/storage_driver.c

index 7aaa060e202c648a3e346f6a3d866099367f9b8f..ddf4405d596c409127d3d98050dc64163a1bfbdf 100644 (file)
@@ -1796,6 +1796,15 @@ storageVolCreateXML(virStoragePoolPtr obj,
     if (virStorageVolCreateXMLEnsureACL(obj->conn, pool->def, voldef) < 0)
         goto cleanup;
 
+    /* While not perfect, refresh the list of volumes in the pool and
+     * then check that the incoming name isn't already in the pool.
+     */
+    if (backend->refreshPool) {
+        virStoragePoolObjClearVols(pool);
+        if (backend->refreshPool(obj->conn, pool) < 0)
+            goto cleanup;
+    }
+
     if (virStorageVolDefFindByName(pool, voldef->name)) {
         virReportError(VIR_ERR_STORAGE_VOL_EXIST,
                        _("'%s'"), voldef->name);