]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Fix NULL dereference caused by ACL filtering of domains
authorJiri Denemark <jdenemar@redhat.com>
Thu, 4 Jul 2013 14:55:53 +0000 (16:55 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Thu, 4 Jul 2013 14:55:53 +0000 (16:55 +0200)
Caused by 763973607ddace04562da1a1e545ab6692d5175f.

src/libxl/libxl_driver.c
src/qemu/qemu_driver.c

index 1bae3d65a3fd4f2148c105567b7b04092a165c45..ededbbc2f3ffa69f1fdb79a906f977807877b876 100644 (file)
@@ -3221,7 +3221,8 @@ libxlConnectNumOfDefinedDomains(virConnectPtr conn)
 
     libxlDriverLock(driver);
     n = virDomainObjListNumOfDomains(driver->domains, false,
-                                     virConnectNumOfDefinedDomainsCheckACL, NULL);
+                                     virConnectNumOfDefinedDomainsCheckACL,
+                                     conn);
     libxlDriverUnlock(driver);
 
     return n;
index 94cebe8b71a78ba41ae3d75915226d5608b58e40..1b9ba41f885d7de3bcd7705636f30ce7e68974ef 100644 (file)
@@ -5887,7 +5887,8 @@ static int qemuConnectListDefinedDomains(virConnectPtr conn,
         goto cleanup;
 
     ret = virDomainObjListGetInactiveNames(driver->domains, names, nnames,
-                                           virConnectListDefinedDomainsCheckACL, NULL);
+                                           virConnectListDefinedDomainsCheckACL,
+                                           conn);
 
 cleanup:
     return ret;
@@ -5901,7 +5902,8 @@ static int qemuConnectNumOfDefinedDomains(virConnectPtr conn) {
         goto cleanup;
 
     ret = virDomainObjListNumOfDomains(driver->domains, false,
-                                       virConnectNumOfDefinedDomainsCheckACL, NULL);
+                                       virConnectNumOfDefinedDomainsCheckACL,
+                                       conn);
 
 cleanup:
     return ret;