From: Gianni Tedesco Subject: [PATCH]: libxl: don't 'leak' gc pointers to caller's structs thereby preventing a double free Date: Fri, 10 Sep 2010 15:17:13 +0100 Message-ID: <1284128233.17452.145.camel@qabil.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Xen Devel Cc: Ian Campbell , Ian Jackson List-Id: xen-devel@lists.xenproject.org libxl_build_device_model uses a pointer in a caller supplied data structure to synthesize a vif-name if one is not supplied. This is bad juju because the caller may want to free this pointer but by the time it get's a chance the gc has already done so. Switch to using a local variable for this pointer and avoid a double-free in the domain create path. Gianni Tedesco diff -r ef2d0a9b2036 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Sep 10 14:59:29 2010 +0100 +++ b/tools/libxl/libxl.c Fri Sep 10 15:16:41 2010 +0100 @@ -1190,14 +1190,17 @@ static char ** libxl_build_device_model_ 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]); + char *ifname; if (!vifs[i].ifname) - vifs[i].ifname = libxl__sprintf(gc, "tap%d.%d", info->domid, vifs[i].devid); + 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,bridge=%s,script=no", - vifs[i].devid, vifs[i].ifname, vifs[i].bridge)); + vifs[i].devid, ifname, vifs[i].bridge)); ioemu_vifs++; } }