[libvirt] [PATCH] Fix NULL dereference caused by ACL filtering of domains

Caused by 763973607ddace04562da1a1e545ab6692d5175f. --- src/libxl/libxl_driver.c | 3 ++- src/qemu/qemu_driver.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 1bae3d6..ededbbc 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3221,7 +3221,8 @@ libxlConnectNumOfDefinedDomains(virConnectPtr conn) libxlDriverLock(driver); n = virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, NULL); + virConnectNumOfDefinedDomainsCheckACL, + conn); libxlDriverUnlock(driver); return n; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 94cebe8..1b9ba41 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -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; -- 1.8.2.1

On Thu, Jul 04, 2013 at 05:02:00PM +0200, Jiri Denemark wrote:
Caused by 763973607ddace04562da1a1e545ab6692d5175f. --- src/libxl/libxl_driver.c | 3 ++- src/qemu/qemu_driver.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 1bae3d6..ededbbc 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3221,7 +3221,8 @@ libxlConnectNumOfDefinedDomains(virConnectPtr conn)
libxlDriverLock(driver); n = virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, NULL); + virConnectNumOfDefinedDomainsCheckACL, + conn); libxlDriverUnlock(driver);
return n; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 94cebe8..1b9ba41 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -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;
ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

On Thu, Jul 04, 2013 at 16:19:15 +0100, Daniel Berrange wrote:
On Thu, Jul 04, 2013 at 05:02:00PM +0200, Jiri Denemark wrote:
Caused by 763973607ddace04562da1a1e545ab6692d5175f. --- src/libxl/libxl_driver.c | 3 ++- src/qemu/qemu_driver.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
ACK
Thanks, pushed. Jirka
participants (2)
-
Daniel P. Berrange
-
Jiri Denemark