From: Anthony PERARD Date: Mon, 13 Dec 2010 17:58:20 +0000 (+0000) Subject: libxl: fix double free of ifname, when makes args for qemu. X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3c97df22bee25ff0fc3d7f3b8642a5aba076b62b;p=xen.git libxl: fix double free of ifname, when makes args for qemu. In libxl_build_device_model_args_new, vifs[i].ifname can be free two times, by the gc, and by freeing the vifs structures. This patch avoids this. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini committer: Stefano Stabellini --- tools/libxl/libxl.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) --- diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 7f27dac261..8fdfd45345 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1341,14 +1341,18 @@ static char ** libxl_build_device_model_args_new(libxl__gc *gc, char *smac = libxl__sprintf(gc, "%02x:%02x:%02x:%02x:%02x:%02x", vifs[i].mac[0], vifs[i].mac[1], vifs[i].mac[2], vifs[i].mac[3], vifs[i].mac[4], vifs[i].mac[5]); - if (!vifs[i].ifname) - vifs[i].ifname = libxl__sprintf(gc, "tap%d.%d", info->domid, vifs[i].devid); + char *ifname; + if (!vifs[i].ifname) { + ifname = libxl__sprintf(gc, "tap%d.%d", info->domid, vifs[i].devid); + } else { + ifname = vifs[i].ifname; + } flexarray_set(dm_args, num++, "-net"); flexarray_set(dm_args, num++, libxl__sprintf(gc, "nic,vlan=%d,macaddr=%s,model=%s", vifs[i].devid, smac, vifs[i].model)); flexarray_set(dm_args, num++, "-net"); flexarray_set(dm_args, num++, libxl__sprintf(gc, "tap,vlan=%d,ifname=%s,script=no", - vifs[i].devid, vifs[i].ifname)); + vifs[i].devid, ifname)); ioemu_vifs++; } }