From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 15 Jan 2016 13:36:45 +0000 (+0100)
Subject: leaseshelper: store server_duid as an allocated string
X-Git-Tag: v1.3.2-rc1~341
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e7e7662bfe8b5637702844727c4f6484554b257;p=thirdparty%2Flibvirt.git

leaseshelper: store server_duid as an allocated string

We either use the value from the environment variable, or learn it from
the existing lease file.

In the second case, the pointer would be pointing into the JSON object
of the first lease with a DUID, owned by leases_array, then
leases_array_new.

Always allocate the string instead, making obvious who should free the
string.
---

diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
index 6930310ae1..3d2daceb8a 100644
--- a/src/network/leaseshelper.c
+++ b/src/network/leaseshelper.c
@@ -122,7 +122,7 @@ main(int argc, char **argv)
     const char *interface = virGetEnvAllowSUID("DNSMASQ_INTERFACE");
     const char *exptime_tmp = virGetEnvAllowSUID("DNSMASQ_LEASE_EXPIRES");
     const char *hostname = virGetEnvAllowSUID("DNSMASQ_SUPPLIED_HOSTNAME");
-    const char *server_duid = virGetEnvAllowSUID("DNSMASQ_SERVER_DUID");
+    char *server_duid = NULL;
     long long currtime = 0;
     long long expirytime = 0;
     size_t i = 0;
@@ -210,6 +210,9 @@ main(int argc, char **argv)
         clientid = argv[2];
     }
 
+    if (VIR_STRDUP(server_duid, virGetEnvAllowSUID("DNSMASQ_SERVER_DUID")) < 0)
+        goto cleanup;
+
     if (virAsprintf(&custom_lease_file,
                     LOCALSTATEDIR "/lib/libvirt/dnsmasq/%s.status",
                     interface) < 0)
@@ -351,11 +354,11 @@ main(int argc, char **argv)
                     /* This is an ipv6 lease */
                     if ((server_duid_tmp
                          = virJSONValueObjectGetString(lease_tmp, "server-duid"))) {
-                        if (!server_duid) {
+                        if (!server_duid && VIR_STRDUP(server_duid, server_duid_tmp) < 0) {
                             /* Control reaches here when the 'action' is not for an
                              * ipv6 lease or, for some weird reason the env var
                              * DNSMASQ_SERVER_DUID wasn't set*/
-                            server_duid = server_duid_tmp;
+                            goto cleanup;
                         }
                     } else {
                         /* Inject server-duid into those ipv6 leases which
@@ -472,6 +475,7 @@ main(int argc, char **argv)
 
     VIR_FREE(pid_file);
     VIR_FREE(exptime);
+    VIR_FREE(server_duid);
     VIR_FREE(lease_entries);
     VIR_FREE(custom_lease_file);
     virJSONValueFree(lease_new);