- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] Misc improvements & fixes to LXC startup
by Daniel P. Berrange 01 May '12

01 May '12

This fixes a startup problem with LXC and security drivers, and adds / improves debugging.

3 7

[libvirt] [PATCH V13 0/5] Add DHCP snooping support to nwfilter
by Stefan Berger 01 May '12

01 May '12

This series of patches adds DHCP snooping support to libvirt's nwfilter subsystem. DHCP snooping detects DHCP leases obtained by a VM and automatically adjusts the network traffic filters to reflect the IP addresses with which a VM may send its traffic, thus for example preventing IP address spoofing. Once leases on IP addresses expire or if a VM gives up on a lease on an IP address, the filters are also adjusted. All leases are persisted and automatically applied upon a VM's restart. Leases are associated with the tuple of VM-UUID and interface MAC address. The following interface XML activates and uses the DHCP snooping: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='CTRL_IP_LEARNING' value='dhcp'/> </filterref> </interface> Once an IP address has been detected on an interface, 'virsh dumpxml <vm>' would show the IP address lease in the format <IP address>,<lease timeout in seconds>: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='CTRL_IP_LEARNING' value='dhcp'/> <parameter name='IP_LEASE' value='192.168.122.210,180'/> </filterref> </interface> Regards, David and Stefan

3 11

[libvirt] [PATCH 0/3] Fix misc LXC startup problems with security drivers
by Daniel P. Berrange 01 May '12

01 May '12

This series fixes a startup problem with LXC and improves debugging capabilities

1 0

[libvirt] [PATCH 0/3] usb devices with same vendor, productID hotplug support
by Guannan Ren 01 May '12

01 May '12

https://bugzilla.redhat.com/show_bug.cgi?id=815755 The set of patch tries to fix the issue when multiple usb devices with same idVendor, idProduct are availible on host, the usb device with lowest bus:device will be attached to guest if usb xml file is given like this: <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x15e1'/> <product id='0x2007'/> </source> </hostdev> The reason is that the usb hotplug function searchs usb device in system files to match vendor and product id, the file with lowest number is always found first. After fix, in this case, libvirt will report an error like: At the same time, the usb part of domain initilization is also update in patch 2/3 # virsh attach-device rhel6u1 /tmp/usb.xml error: Failed to attach device from /tmp/usb.xml error: XML error: multiple USB deivces 15e1:2007, use <address> to specify one.

3 7

[libvirt] ANNOUNCE: Stable release libvirt-0.9.11.1
by Cole Robinson 30 Apr '12

30 Apr '12

I'm pleased to announce the release of libvirt-0.9.11.1. This is libvirt-0.9.11 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/libvirt-0.9.11.1.tar.gz For a complete list of changes since libvirt-0.9.11 GA, please see: http://wiki.libvirt.org/page/Stable_Releases Thanks, Cole

3 2

[libvirt] [PATCH libvirt-glib] Add complete docs for the Libvirt GLib library
by Daniel P. Berrange 30 Apr '12

30 Apr '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Flesh out the section intros for each of the Libvirt GLib library modules, providing using examples where needed, and adding any missing function docs. --- cfg.mk | 2 +- configure.ac | 1 + docs/libvirt-glib/Libvirt-glib-docs.xml | 7 +-- docs/libvirt-glib/Makefile.am | 2 + docs/libvirt-glib/version.xml.in | 1 + libvirt-glib/libvirt-glib-error.c | 56 +++++++++++++++++++---- libvirt-glib/libvirt-glib-event.c | 65 ++++++++++++++++++++++++++ libvirt-glib/libvirt-glib-main.c | 76 +++++++++++++++++++++++++++++++ 8 files changed, 198 insertions(+), 12 deletions(-) create mode 100644 docs/libvirt-glib/version.xml.in diff --git a/cfg.mk b/cfg.mk index ed46aee..099ffa3 100644 --- a/cfg.mk +++ b/cfg.mk @@ -124,7 +124,7 @@ sc_check_author_list: test $$fail = 0 -exclude_file_name_regexp--sc_bindtextdomain = ^(libvirt-gconfig/tests|examples)/ +exclude_file_name_regexp--sc_bindtextdomain = ^(libvirt-gconfig/tests|examples)/|libvirt-glib/libvirt-glib-event.c|libvirt-glib/libvirt-glib-main.c exclude_file_name_regexp--sc_preprocessor_indentation = ^*/*.[ch] diff --git a/configure.ac b/configure.ac index 31f82c9..4b974d4 100644 --- a/configure.ac +++ b/configure.ac @@ -259,6 +259,7 @@ AC_OUTPUT(Makefile vapi/Makefile docs/Makefile docs/libvirt-glib/Makefile + docs/libvirt-glib/version.xml docs/libvirt-gobject/Makefile docs/libvirt-gconfig/Makefile libvirt-glib-1.0.pc diff --git a/docs/libvirt-glib/Libvirt-glib-docs.xml b/docs/libvirt-glib/Libvirt-glib-docs.xml index 5b6a873..f2f3572 100644 --- a/docs/libvirt-glib/Libvirt-glib-docs.xml +++ b/docs/libvirt-glib/Libvirt-glib-docs.xml @@ -3,21 +3,22 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'"> + <!ENTITY version SYSTEM "version.xml"> ]> <book id="index"> <bookinfo> - <title>Libvirt-glib Reference Manual</title> + <title>Libvirt GLib Reference Manual</title> </bookinfo> <chapter> - <title>Libvirt-glib</title> + <title>API Reference</title> <xi:include href="xml/libvirt-glib-main.xml"/> <xi:include href="xml/libvirt-glib-error.xml"/> <xi:include href="xml/libvirt-glib-event.xml"/> </chapter> <chapter id="object-tree"> <title>Object Hierarchy</title> - <xi:include href="xml/tree_index.sgml"/> + <xi:include href="xml/tree_index.sgml"/> </chapter> <index id="api-index-full"> <title>API Index</title> diff --git a/docs/libvirt-glib/Makefile.am b/docs/libvirt-glib/Makefile.am index e45f4e2..186f8ff 100644 --- a/docs/libvirt-glib/Makefile.am +++ b/docs/libvirt-glib/Makefile.am @@ -39,3 +39,5 @@ GTKDOC_LIBS = \ $(top_builddir)/libvirt-glib/libvirt-glib-1.0.la include $(top_srcdir)/gtk-doc.make + +EXTRA_DIST += version.xml.in diff --git a/docs/libvirt-glib/version.xml.in b/docs/libvirt-glib/version.xml.in new file mode 100644 index 0000000..d78bda9 --- /dev/null +++ b/docs/libvirt-glib/version.xml.in @@ -0,0 +1 @@ +@VERSION@ diff --git a/libvirt-glib/libvirt-glib-error.c b/libvirt-glib/libvirt-glib-error.c index 4a44216..7356aed 100644 --- a/libvirt-glib/libvirt-glib-error.c +++ b/libvirt-glib/libvirt-glib-error.c @@ -29,11 +29,51 @@ #include "libvirt-glib/libvirt-glib.h" /** - * gvir_error_new: (skip) + * SECTION:libvirt-glib-error + * @short_description: Convert libvirt error reports to GLib error reports + * @title: Error reporting + * @stability: Stable + * @include: libvirt-glib/libvirt-glib.h + * + * The libvirt API uses the <code>virError</code> structure for reporting + * errors back to the application programmer. The libvirt API errors are + * provided in thread-local variables, while the GLib standard practice is + * to return errors via out parameters. This library provides a simple way + * to fill in <code>GError **</code> output parameters with the contents + * of the most recent libvirt error object in the current thread. + * + * The <code>gvir_error_new</code>, <code>gvir_error_new_literal</code> and + * <code>gvir_error_new_valist</code> methods all return a newly created + * <code>GError *</code> object instance, differing only in the way the + * message needs to be provided. For most usage though, it is preferrable + * to use the <code>gvir_set_error</code>, <code>gvir_set_error_literal</code> + * and <code>gvir_set_error_valist</code> methods. These all accept a + * <code>GError **</code> argument and take care to only fill it if it + * points to a non-NULL location. + * + * <example> + * <title>Reporting GLib errors with libvirt APIs</title> + * <programlisting><![CDATA[ + * gboolean myapp_start_guest(const gchar *xml, GError **error) + * { + * if (virDomainCreate(conn, xml, 0) < 0) { + * gvir_set_error_literal(error, "Unable to start virtual machine"); + * return FALSE; + * } + * + * return TRUE; + * } + * ]]></programlisting> + * </example> + * + */ + +/** + * gvir_error_new: * @domain: error domain * @code: error code * @format: printf()-style format for error message - * @Varargs: parameters for message format + * @...: parameters for message format * * Creates a new #GError with the given @domain and @code, * and a message formatted with @format. @@ -61,7 +101,7 @@ GError *gvir_error_new(GQuark domain, } /** - * gvir_error_new_literal: (skip) + * gvir_error_new_literal: * @domain: error domain * @code: error code * @message: error message @@ -99,7 +139,7 @@ GError *gvir_error_new_literal(GQuark domain, } /** - * gvir_error_new_valist: (skip) + * gvir_error_new_valist: * @domain: error domain * @code: error code * @format: printf()-style format for error message @@ -129,12 +169,12 @@ GError *gvir_error_new_valist(GQuark domain, /** - * gvir_set_error: (skip) + * gvir_set_error: * @error: pointer to error location * @domain: error domain * @code: error code * @format: printf()-style format for error message - * @Varargs: parameters for message format + * @...: parameters for message format * * If @error is NULL this does nothing. Otherwise it * creates a new #GError with the given @domain and @code, @@ -164,7 +204,7 @@ void gvir_set_error(GError **error, /** - * gvir_set_error_literal: (skip) + * gvir_set_error_literal: * @error: pointer to error location * @domain: error domain * @code: error code @@ -190,7 +230,7 @@ void gvir_set_error_literal(GError **error, /** - * gvir_set_error_valist: (skip) + * gvir_set_error_valist: * @error: pointer to error location * @domain: error domain * @code: error code diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 6d54b10..94f4de8 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -31,6 +31,53 @@ #include "libvirt-glib/libvirt-glib.h" +/** + * SECTION:libvirt-glib-event + * @short_description: Integrate libvirt with the GMain event framework + * @title: Event loop + * @stability: Stable + * @include: libvirt-glib/libvirt-glib.h + * + * The libvirt API has the ability to provide applications with asynchronous + * notifications of interesting events. To enable this functionality though, + * applications must provide libvirt with an event loop implementation. The + * libvirt-glib API provides such an implementation, which naturally integrates + * with the GMain event loop framework. + * + * To enable use of the GMain event loop glue, the <code>gvir_event_register()</code> + * should be invoked. Once this is done, it is mandatory to have the default + * GMain event loop run by a thread in the application, usually the primary + * thread, eg by using <code>gtk_main()</code> or <code>g_application_run()</code> + * + * <example> + * <title>Registering for events with a GTK application</title> + * <programlisting><![CDATA[ + * int main(int argc, char **argv) { + * ...setup... + * gvir_event_register(); + * ...more setup... + * gtk_main(); + * return 0; + * } + * ]]></programlisting> + * </example> + * + * <example> + * <title>Registering for events using Appplication</title> + * <programlisting><![CDATA[ + * int main(int argc, char **argv) { + * ...setup... + * GApplication *app = ...create some impl of GApplication... + * gvir_event_register(); + * ...more setup... + * g_application_run(app); + * return 0; + * } + * ]]></programlisting> + * </example> + */ + + #if GLIB_CHECK_VERSION(2, 31, 0) #define g_mutex_new() g_new0(GMutex, 1) #endif @@ -414,6 +461,24 @@ static gpointer event_register_once(gpointer data G_GNUC_UNUSED) return NULL; } + +/** + * gvir_event_register: + * + * Registers a libvirt event loop implementation that is backed + * by the default <code>GMain</code> context. If invoked more + * than once this method will be a no-op. Applications should, + * however, take care not to register any another non-GLib + * event loop with libvirt. + * + * After invoking this method, it is mandatory to run the + * default GMain event loop. Typically this can be satisfied + * by invoking <code>gtk_main</code> or <code>g_application_run</code> + * in the application's main thread. Failure to run the event + * loop will mean no libvirt events get dispatched, and the + * libvirt keepalive timer will kill off libvirt connections + * frequently. + */ void gvir_event_register(void) { static GOnce once = G_ONCE_INIT; diff --git a/libvirt-glib/libvirt-glib-main.c b/libvirt-glib/libvirt-glib-main.c index 0cb2dd5..3389de9 100644 --- a/libvirt-glib/libvirt-glib-main.c +++ b/libvirt-glib/libvirt-glib-main.c @@ -29,6 +29,36 @@ #include "libvirt-glib-main.h" +/** + * SECTION:libvirt-glib-main + * @short_description: Initialize the library + * @title: Library initialization + * @stability: Stable + * @include: libvirt-glib/libvirt-glib.h + * + * The Libvirt GLib library provides glue to integrate core libvirt + * infrastructure with the GLib library. This enables consistent + * error reporting procedures and a common event loop implementation + * for applications. + * + * Before using any functions in the Libvirt GLib library, it must be initialized + * by calling <code>gvir_init</code> or <code>gvir_init_check</code>. + * + * <example> + * <title>Initializing the Libvirt GLib library</title> + * <programlisting><![CDATA[ + * int main(int argc, char **argv) { + * ...setup... + * gvir_init(&argc, &argv); + * ...more setup... + * gtk_main(); + * return 0; + * } + * ]]></programlisting> + * </example> + * + */ + static void gvir_error_func(gpointer opaque G_GNUC_UNUSED, virErrorPtr err) @@ -37,6 +67,33 @@ gvir_error_func(gpointer opaque G_GNUC_UNUSED, } + +/** + * gvir_init: + * @argc: (inout): Address of the argc parameter of your main() function (or 0 + * if argv is NULL). This will be changed if any arguments were handled. + * @argv: (array length=argc) (inout) (allow-none): Address of the + * <parameter>argv</parameter> parameter of main(), or %NULL. Any options + * understood by GTK+ are stripped before return. + * + * Call this function before using any other Libvirt GLib functions in your applications. + * It will initialize everything needed to operate the toolkit and parses some standard + * command line options. + * + * Although you are expected to pass the @argc, @argv parameters from main() to this + * function, it is possible to pass NULL if @argv is not available or commandline + * handling is not required. + * + * @argc and @argv are adjusted accordingly so your own code will never see those + * standard arguments. + * + * This method will also turn on debug logging of the library if the + * <literal>LIBVIRT_GLIB_DEBUG</literal> environment variable is set. + * + * This function will terminate your program if it was unable to initialize + * for some reason. If you want the program to fall back to an alternate + * mode of operation call <code>gvir_init_check</code> instead. + */ void gvir_init(int *argc, char ***argv) { @@ -58,6 +115,25 @@ static void gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED, } +/** + * gvir_init_check: + * @argc: (inout): Address of the argc parameter of your main() function (or 0 + * if argv is NULL). This will be changed if any arguments were handled. + * @argv: (array length=argc) (inout) (allow-none): Address of the + * <parameter>argv</parameter> parameter of main(), or %NULL. Any options + * understood by GTK+ are stripped before return. + * @err: filled with the error information if initialized failed. + * + * This function does the same work as gvir_init() with only a single + * change: It does not terminate the program if the Libvirt GLib library + * can't be initialized. Instead it returns %FALSE on failure. + * + * This way the application can fall back to some other mode of + * operation. + * + * Return value: %TRUE if the library was successfully initialized, + * %FALSE otherwise + */ gboolean gvir_init_check(int *argc G_GNUC_UNUSED, char ***argv G_GNUC_UNUSED, GError **err G_GNUC_UNUSED) -- 1.7.10

2 1

[libvirt] [PATCH] Ensure libvirt_lxc process loads the live XML config
by Daniel P. Berrange 30 Apr '12

30 Apr '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently the libvirt_lxc process uses VIR_DOMAIN_XML_INACTIVE when loading the XML for the container. This means it looses any dynamic data such as the, just allocated, SELinux label. Further there is an inconsistency in the libvirt LXC driver whereby it saves the live config XML and then later overwrites the file with the live status XML instead. Add a comment about this for future reference. * src/lxc/lxc_controller.c: Remove VIR_DOMAIN_XML_INACTIVE when loading XML * src/lxc/lxc_driver.c: Add comment about inconsistent config file formats Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 2617423..1e3ec30 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1781,7 +1781,7 @@ int main(int argc, char *argv[]) if ((def = virDomainDefParseFile(caps, configFile, 1 << VIR_DOMAIN_VIRT_LXC, - VIR_DOMAIN_XML_INACTIVE)) == NULL) + 0)) == NULL) goto cleanup; if (def->nnets != nveths) { diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 7e7affd..ffdd4ac 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1955,17 +1955,15 @@ static int lxcVmStart(virConnectPtr conn, lxcProcessAutoDestroyAdd(driver, vm, conn) < 0) goto error; - /* - * Again, need to save the live configuration, because the function - * requires vm->def->id != -1 to save tty info surely. - */ - if (virDomainSaveConfig(driver->stateDir, vm->def) < 0) - goto error; - if (virDomainObjSetDefTransient(driver->caps, vm, false) < 0) goto error; - /* Write domain status to disk. */ + /* Write domain status to disk. + * + * XXX: Earlier we wrote the plain "live" domain XML to this + * location for the benefit of libvirt_lxc. We're now overwriting + * it with the live status XML instead. This is a (currently + * harmless) inconsistency we should fix one day */ if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) goto error; -- 1.7.10

2 1

[libvirt] [PATCH] util: Avoid libvirtd crash
by Alex Jia 30 Apr '12

30 Apr '12

In fact, the 'tapfd' is always NULL, the function 'virNetDevTapCreate()' hasn't assign 'fd' to 'tapfd', when the function 'virNetDevSetMAC()' is failed then goto 'error' lable, finally, the VIR_FORCE_CLOSE() will deref a NULL 'tapfd'. * util/virnetdevtap.c (virNetDevTapCreateInBridgePort): fix a NULL pointer derefing. * How to reproduce? $ cat > /tmp/net.xml <<EOF <network> <name>test</name> <forward mode='nat'/> <bridge name='br1' stp='off' delay='1' /> <mac address='00:00:00:00:00:00'/> <ip address='192.168.100.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.100.2' end='192.168.100.254' /> </dhcp> </ip> </network> EOF $ virsh net-define /tmp/net.xml $ virsh net-start test error: Failed to start network brTest error: End of file while reading data: Input/output error Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/util/virnetdevtap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 0b3ac46..5d21164 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -341,7 +341,8 @@ int virNetDevTapCreateInBridgePort(const char *brname, return 0; error: - VIR_FORCE_CLOSE(*tapfd); + if (tapfd) + VIR_FORCE_CLOSE(*tapfd); return errno; } -- 1.7.1

3 2

[libvirt] [PATCH] storage: fix build with iscsi
by Eric Blake 30 Apr '12

30 Apr '12

The previous storage patch missed an instance affected by the struct member rename. * src/storage/storage_backend_iscsi.c (virStorageBackendISCSIFindPoolSources): Adjust to new struct. --- Pushing under the build-breaker rule. src/storage/storage_backend_iscsi.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 22a34af..4f57d85 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -1,7 +1,7 @@ /* * storage_backend_iscsi.c: storage backend for iSCSI handling * - * Copyright (C) 2007-2008, 2010-2011 Red Hat, Inc. + * Copyright (C) 2007-2008, 2010-2012 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -589,11 +589,13 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, } for (i = 0 ; i < ntargets ; i++) { - if (VIR_ALLOC_N(list.sources[i].devices, 1) < 0) { + if (VIR_ALLOC_N(list.sources[i].devices, 1) < 0 || + VIR_ALLOC_N(list.sources[i].hosts, 1)) { virReportOOMError(); goto cleanup; } - list.sources[i].host = source->hosts[0]; + list.sources[i].nhost = 1; + list.sources[i].hosts[0] = source->hosts[0]; list.sources[i].initiator = source->initiator; list.sources[i].ndevice = 1; list.sources[i].devices[0].path = targets[i]; @@ -607,8 +609,10 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, cleanup: if (list.sources) { - for (i = 0 ; i < ntargets ; i++) + for (i = 0 ; i < ntargets ; i++) { + VIR_FREE(list.sources[i].hosts); VIR_FREE(list.sources[i].devices); + } VIR_FREE(list.sources); } for (i = 0 ; i < ntargets ; i++) -- 1.7.1

3 3

[libvirt] [PATCH] Yet more coverity fixes
by Stefan Berger 30 Apr '12

30 Apr '12

Addressing the following reports: Error: RESOURCE_LEAK: /libvirt/src/nodeinfo.c:631: alloc_fn: Calling allocation function "fopen". /libvirt/src/nodeinfo.c:631: var_assign: Assigning: "cpuinfo" = storage returned from "fopen("/proc/cpuinfo", "r")". /libvirt/src/nodeinfo.c:640: leaked_storage: Variable "cpuinfo" going out of scope leaks the storage it points to. Error: RESOURCE_LEAK: /libvirt/src/vmx/vmx.c:2431: alloc_fn: Calling allocation function "calloc". /libvirt/src/vmx/vmx.c:2431: var_assign: Assigning: "networkName" = storage returned from "calloc(1UL, 1UL)". /libvirt/src/vmx/vmx.c:2495: leaked_storage: Variable "networkName" going out of scope leaks the storage it points to. Error: RESOURCE_LEAK: /libvirt/src/util/virnetlink.c:338: alloc_arg: Calling allocation function "virAlloc" on "srv". /libvirt/src/util/memory.c:101: alloc_fn: Storage is returned from allocation function "calloc". /libvirt/src/util/memory.c:101: var_assign: Assigning: "*((void **)ptrptr)" = "calloc(1UL, size)". /libvirt/src/util/virnetlink.c:343: noescape: Variable "srv" is not freed or pointed-to in function "virMutexInit". /libvirt/src/util/threads-pthread.c:49:30: noescape: "virMutexInit" does not free or save its pointer parameter "m". /libvirt/src/util/virnetlink.c:404: leaked_storage: Variable "srv" going out of scope leaks the storage it points to. Error: RESOURCE_LEAK: /libvirt/src/qemu/qemu_driver.c:6968: alloc_fn: Calling allocation function "calloc". /libvirt/src/qemu/qemu_driver.c:6968: var_assign: Assigning: "nodeset" = storage returned from "calloc(1UL, 1UL)". /libvirt/src/qemu/qemu_driver.c:6977: noescape: Variable "nodeset" is not freed or pointed-to in function "virTypedParameterAssign". /libvirt/src/qemu/qemu_driver.c:6997: leaked_storage: Variable "nodeset" going out of scope leaks the storage it points to. Error: RESOURCE_LEAK: /libvirt/tests/qemuxml2argvtest.c:47: alloc_arg: Calling allocation function "virAlloc" on "ret". /libvirt/src/util/memory.c:101: alloc_fn: Storage is returned from allocation function "calloc". /libvirt/src/util/memory.c:101: var_assign: Assigning: "*((void **)ptrptr)" = "calloc(1UL, size)". /libvirt/tests/qemuxml2argvtest.c:54: leaked_storage: Variable "ret" going out of scope leaks the storage it points to. Error: STRING_NULL: /libvirt/src/util/uuid.c:273: string_null_argument: Function "getDMISystemUUID" does not terminate string "*dmiuuid". /libvirt/src/util/uuid.c:241: string_null_argument: Function "saferead" fills array "*uuid" with a non-terminated string. /libvirt/src/util/util.c:101: string_null_argument: Function "read" fills array "*buf" with a non-terminated string. /libvirt/src/util/uuid.c:274: string_null: Passing unterminated string "dmiuuid" to a function expecting a null-terminated string. /libvirt/src/util/uuid.c:138: var_assign_parm: Assigning: "cur" = "uuidstr". They now point to the same thing. /libvirt/src/util/uuid.c:164: string_null_sink_loop: Searching for null termination in an unterminated array "cur". Error: STRING_NULL: /libvirt/src/node_device/node_device_linux_sysfs.c:80: string_null_argument: Function "saferead" does not terminate string "*buf". /libvirt/src/util/util.c:101: string_null_argument: Function "read" fills array "*buf" with a non-terminated string. /libvirt/src/node_device/node_device_linux_sysfs.c:87: string_null: Passing unterminated string "buf" to a function expecting a null-terminated string. --- daemon/libvirtd.c | 24 +++++++++++++++++++----- src/node_device/node_device_linux_sysfs.c | 9 +++++---- src/nodeinfo.c | 1 + src/qemu/qemu_driver.c | 4 ++++ src/util/uuid.c | 5 +++-- src/util/virnetlink.c | 7 ++++++- src/vmx/vmx.c | 1 + tests/qemuxml2argvtest.c | 4 +++- 8 files changed, 42 insertions(+), 13 deletions(-) Index: libvirt-acl/daemon/libvirtd.c =================================================================== --- libvirt-acl.orig/daemon/libvirtd.c +++ libvirt-acl/daemon/libvirtd.c @@ -141,6 +141,7 @@ static int daemonForkIntoBackground(cons int stdinfd = -1; int stdoutfd = -1; int nextpid; + int tmpfd; VIR_FORCE_CLOSE(statuspipe[0]); @@ -151,16 +152,16 @@ static int daemonForkIntoBackground(cons if (dup2(stdinfd, STDIN_FILENO) != STDIN_FILENO) goto cleanup; if (dup2(stdoutfd, STDOUT_FILENO) != STDOUT_FILENO) - goto cleanup; + goto cleanup_close_stdin_fileno; if (dup2(stdoutfd, STDERR_FILENO) != STDERR_FILENO) - goto cleanup; + goto cleanup_close_stdout_fileno; if (stdinfd > STDERR_FILENO && VIR_CLOSE(stdinfd) < 0) - goto cleanup; + goto cleanup_close_stderr_fileno; if (stdoutfd > STDERR_FILENO && VIR_CLOSE(stdoutfd) < 0) - goto cleanup; + goto cleanup_close_stderr_fileno; if (setsid() < 0) - goto cleanup; + goto cleanup_close_stderr_fileno; nextpid = fork(); switch (nextpid) { @@ -172,6 +173,19 @@ static int daemonForkIntoBackground(cons _exit(EXIT_SUCCESS); } + + cleanup_close_stderr_fileno: + tmpfd = STDERR_FILENO; + VIR_FORCE_CLOSE(tmpfd); + + cleanup_close_stdout_fileno: + tmpfd = STDOUT_FILENO; + VIR_FORCE_CLOSE(tmpfd); + + cleanup_close_stdin_fileno: + tmpfd = STDIN_FILENO; + VIR_FORCE_CLOSE(tmpfd); + cleanup: VIR_FORCE_CLOSE(stdoutfd); VIR_FORCE_CLOSE(stdinfd); Index: libvirt-acl/src/node_device/node_device_linux_sysfs.c =================================================================== --- libvirt-acl.orig/src/node_device/node_device_linux_sysfs.c +++ libvirt-acl/src/node_device/node_device_linux_sysfs.c @@ -69,20 +69,21 @@ out: int read_wwn_linux(int host, const char *file, char **wwn) { char *p = NULL; - int fd = -1, retval = 0; - char buf[64]; + int fd = -1, retval = 0, len; + char buf[65]; if (open_wwn_file(LINUX_SYSFS_FC_HOST_PREFIX, host, file, &fd) < 0) { goto out; } - memset(buf, 0, sizeof(buf)); - if (saferead(fd, buf, sizeof(buf)) < 0) { + len = saferead(fd, buf, sizeof(buf) - 1); + if (len < 0) { retval = -1; VIR_DEBUG("Failed to read WWN for host%d '%s'", host, file); goto out; } + buf[len] = '\0'; p = strstr(buf, "0x"); if (p != NULL) { Index: libvirt-acl/src/nodeinfo.c =================================================================== --- libvirt-acl.orig/src/nodeinfo.c +++ libvirt-acl/src/nodeinfo.c @@ -636,6 +636,7 @@ int nodeGetInfo(virConnectPtr conn ATTRI } if (virAsprintf(&sysfs_cpuinfo, CPU_SYS_PATH) < 0) { + VIR_FORCE_FCLOSE(cpuinfo); virReportOOMError(); return -1; } Index: libvirt-acl/src/util/uuid.c =================================================================== --- libvirt-acl.orig/src/util/uuid.c +++ libvirt-acl/src/util/uuid.c @@ -269,8 +269,9 @@ virSetHostUUIDStr(const char *uuid) return EEXIST; if (!uuid) { - memset(dmiuuid, 0, sizeof(dmiuuid)); - if (!getDMISystemUUID(dmiuuid, sizeof(dmiuuid) - 1)) { + rc = getDMISystemUUID(dmiuuid, sizeof(dmiuuid) - 1); + dmiuuid[VIR_UUID_STRING_BUFLEN - 1] = '\0'; + if (!rc) { if (!virUUIDParse(dmiuuid, host_uuid)) return 0; } Index: libvirt-acl/src/util/virnetlink.c =================================================================== --- libvirt-acl.orig/src/util/virnetlink.c +++ libvirt-acl/src/util/virnetlink.c @@ -341,7 +341,7 @@ virNetlinkEventServiceStart(void) } if (virMutexInit(&srv->lock) < 0) - goto error; + goto error_free_srv; virNetlinkEventServerLock(srv); @@ -402,6 +402,11 @@ error_locked: } error: return ret; + +error_free_srv: + VIR_FREE(srv); + + return ret; } /** Index: libvirt-acl/src/vmx/vmx.c =================================================================== --- libvirt-acl.orig/src/vmx/vmx.c +++ libvirt-acl/src/vmx/vmx.c @@ -2485,6 +2485,7 @@ virVMXParseEthernet(virConfPtr conf, int *def = NULL; } + VIR_FREE(networkName); VIR_FREE(connectionType); VIR_FREE(addressType); VIR_FREE(generatedAddress); Index: libvirt-acl/tests/qemuxml2argvtest.c =================================================================== --- libvirt-acl.orig/tests/qemuxml2argvtest.c +++ libvirt-acl/tests/qemuxml2argvtest.c @@ -50,8 +50,10 @@ fakeSecretLookupByUsage(virConnectPtr co ret->magic = VIR_SECRET_MAGIC; ret->refs = 1; ret->usageID = strdup(usageID); - if (!ret->usageID) + if (!ret->usageID) { + VIR_FREE(ret); return NULL; + } ret->conn = conn; conn->refs++; return ret; Index: libvirt-acl/src/qemu/qemu_driver.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_driver.c +++ libvirt-acl/src/qemu/qemu_driver.c @@ -6984,6 +6984,9 @@ qemuDomainGetNumaParameters(virDomainPtr if (virTypedParameterAssign(param, VIR_DOMAIN_NUMA_NODESET, VIR_TYPED_PARAM_STRING, nodeset) < 0) goto cleanup; + + nodeset = NULL; + break; default: @@ -6997,6 +7000,7 @@ qemuDomainGetNumaParameters(virDomainPtr ret = 0; cleanup: + VIR_FREE(nodeset); virCgroupFree(&group); if (vm) virDomainObjUnlock(vm);

2 4