Mailing List Archive

# HG changeset patch
# User David Scott <dave.scott@eu.citrix.com>
# Date 1301595556 -3600
# Node ID 2a6c4487c22e33e59bd43fce9f21f686050fbede
# Parent b056c3850c78a73304a41f86d72bbfca843533d7
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>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---


diff -r b056c3850c78 -r 2a6c4487c22e tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Thu Mar 31 19:07:06 2011 +0100
+++ b/tools/libxl/xl_cmdimpl.c Thu Mar 31 19:19:16 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 {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog