xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: David Scott <dave.scott@eu.citrix.com>
To: xen-devel@lists.xensource.com
Subject: [PATCH 1 of 5] libxl: fix memory management in "xl network-attach"
Date: Mon, 28 Mar 2011 13:26:35 +0100	[thread overview]
Message-ID: <85361e3dab12827c6321.1301315195@ely> (raw)
In-Reply-To: <patchbomb.1301315194@ely>

# HG changeset patch
# User David Scott <dave.scott@eu.citrix.com>
# Date 1301314652 -3600
# Node ID 85361e3dab12827c6321931c9e09d02fb22578ee
# Parent  a65612bcbb921e98a8843157bf365e4ab16e8144
libxl: fix memory management in "xl network-attach"

The libxl_device_nic struct has strings which are initially strdup()ed and then free()ed in libxl_device_nic_destroy(). In the "network-attach" parser we need to free() the existing string and strdup((*argv) + N), rather than just copying the pointer.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff -r a65612bcbb92 -r 85361e3dab12 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c	Fri Mar 25 09:03:17 2011 +0000
+++ b/tools/libxl/xl_cmdimpl.c	Mon Mar 28 13:17:32 2011 +0100
@@ -4277,12 +4277,14 @@
                 nic.mac[i] = val;
             }
         } else if (!strncmp("bridge=", *argv, 7)) {
-            nic.bridge = (*argv) + 7;
+            free(nic.bridge);
+            nic.bridge = strdup((*argv) + 7);
         } else if (!strncmp("ip=", *argv, 3)) {
             free(nic.ip);
             nic.ip = strdup((*argv) + 3);
         } else if (!strncmp("script=", *argv, 6)) {
-            nic.script = (*argv) + 6;
+            free(nic.script);
+            nic.script = strdup((*argv) + 6);
         } else if (!strncmp("backend=", *argv, 8)) {
             if(libxl_name_to_domid(&ctx, ((*argv) + 8), &val)) {
                 fprintf(stderr, "Specified backend domain does not exist, defaulting to Dom0\n");
@@ -4290,9 +4292,11 @@
             }
             nic.backend_domid = val;
         } else if (!strncmp("vifname=", *argv, 8)) {
-            nic.ifname = (*argv) + 8;
+            free(nic.ifname);
+            nic.ifname = strdup((*argv) + 8);
         } else if (!strncmp("model=", *argv, 6)) {
-            nic.model = (*argv) + 6;
+            free(nic.model);
+            nic.model = strdup((*argv) + 6);
         } else if (!strncmp("rate=", *argv, 5)) {
         } else if (!strncmp("accel=", *argv, 6)) {
         } else {

  reply	other threads:[~2011-03-28 12:26 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-28 12:26 [PATCH 0 of 5] Improvements to libxl VIF hotplug, unplug; xapi can now use these functions David Scott
2011-03-28 12:26 ` David Scott [this message]
2011-03-28 14:37   ` [PATCH 1 of 5] libxl: fix memory management in "xl network-attach" Stefano Stabellini
2011-03-29  8:30   ` Ian Campbell
2011-03-28 12:26 ` [PATCH 2 of 5] tools: ocaml: move the nic_info record into a module to the field labels live in a separate namespace David Scott
2011-03-29  8:42   ` Ian Campbell
2011-03-30 17:18     ` Dave Scott
2011-03-28 12:26 ` [PATCH 3 of 5] libxl: add NIC QoS parameters David Scott
2011-03-28 14:37   ` Stefano Stabellini
2011-03-29  8:48     ` Ian Campbell
2011-03-28 12:26 ` [PATCH 4 of 5] tools: ocaml: add NIC QoS parameters to the ocaml libxl interface David Scott
2011-03-29  8:49   ` Ian Campbell
2011-03-28 12:26 ` [PATCH 5 of 5] tools: ocaml: rename nic_remove to nic_del, for consistency with libxl David Scott
2011-03-29  8:52   ` Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=85361e3dab12827c6321.1301315195@ely \
    --to=dave.scott@eu.citrix.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).