External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete udevFreeIfaceDef function in udev interface driver

Browse Source 
The udevFreeIfaceDef function in the udev interface driver
just duplicates code from virInterfaceDefFree. Delete it
and call the standard API instead.

Fix the udevGetIfaceDefVlan method so that it doesn't
store pointers to the middle of a malloc'd memory
area.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-04-29 18:10:57 +01:00
parent 946c9f75d0
commit df5c9e6984
1 changed files with 15 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/interface/interface_backend_udev.c
View File

@ -543,44 +543,6 @@ udevBridgeScanDirFilter(const struct dirent *entry)
return 1; return 1;
} }
/**
* Frees any memory allocated by udevGetIfaceDef()
*
* @param ifacedef - interface to free and cleanup
*/
static void
udevFreeIfaceDef(virInterfaceDef *ifacedef)
{
int i;
if (!ifacedef)
return;
if (ifacedef->type == VIR_INTERFACE_TYPE_BOND) {
VIR_FREE(ifacedef->data.bond.target);
for (i = 0; i < ifacedef->data.bond.nbItf; i++) {
udevFreeIfaceDef(ifacedef->data.bond.itf[i]);
}
VIR_FREE(ifacedef->data.bond.itf);
}
if (ifacedef->type == VIR_INTERFACE_TYPE_BRIDGE) {
VIR_FREE(ifacedef->data.bridge.delay);
for (i = 0; i < ifacedef->data.bridge.nbItf; i++) {
udevFreeIfaceDef(ifacedef->data.bridge.itf[i]);
}
VIR_FREE(ifacedef->data.bridge.itf);
}
if (ifacedef->type == VIR_INTERFACE_TYPE_VLAN) {
VIR_FREE(ifacedef->data.vlan.devname);
}
VIR_FREE(ifacedef->mac);
VIR_FREE(ifacedef->name);
VIR_FREE(ifacedef);
}
static int static int
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
@ -935,36 +897,29 @@ udevGetIfaceDefVlan(struct udev *udev ATTRIBUTE_UNUSED,
const char *name, const char *name,
virInterfaceDef *ifacedef) virInterfaceDef *ifacedef)
{ {
char *vid; const char *vid;
char *vlan_parent_dev = NULL;
vlan_parent_dev = strdup(name);
if (!vlan_parent_dev) {
virReportOOMError();
goto cleanup;
}
/* Find the DEVICE.VID again */ /* Find the DEVICE.VID again */
vid = strrchr(vlan_parent_dev, '.'); vid = strrchr(name, '.');
if (!vid) { if (!vid) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("failed to find the VID for the VLAN device '%s'"), _("failed to find the VID for the VLAN device '%s'"),
name); name);
goto cleanup; return -1;
} }
/* Replace the dot with a NULL so we can have the device and VID */
vid[0] = '\0';
vid++;
/* Set the VLAN specifics */ /* Set the VLAN specifics */
ifacedef->data.vlan.tag = vid; if (VIR_STRDUP(ifacedef->data.vlan.tag, vid + 1) < 0)
ifacedef->data.vlan.devname = vlan_parent_dev; goto cleanup;
if (VIR_STRNDUP(ifacedef->data.vlan.devname,
name, (vid - name)) < 0)
goto cleanup;
return 0; return 0;
cleanup: cleanup:
VIR_FREE(vlan_parent_dev); VIR_FREE(ifacedef->data.vlan.tag);
VIR_FREE(ifacedef->data.vlan.devname);
return -1; return -1;
} }
@ -1081,7 +1036,7 @@ udevGetIfaceDef(struct udev *udev, const char *name)
cleanup: cleanup:
udev_device_unref(dev); udev_device_unref(dev);
udevFreeIfaceDef(ifacedef); virInterfaceDefFree(ifacedef);
return NULL; return NULL;
} }
@ -1102,15 +1057,12 @@ udevInterfaceGetXMLDesc(virInterfacePtr ifinfo,
*/ */
ifacedef = udevGetIfaceDef(udev, ifinfo->name); ifacedef = udevGetIfaceDef(udev, ifinfo->name);
/* We've already printed by it happened */
if (!ifacedef) if (!ifacedef)
goto err; goto err;
/* Convert our interface to XML */
xmlstr = virInterfaceDefFormat(ifacedef); xmlstr = virInterfaceDefFormat(ifacedef);
/* Recursively free our interface structures and free the children too */ virInterfaceDefFree(ifacedef);
udevFreeIfaceDef(ifacedef);
err: err:
/* decrement our udev ptr */ /* decrement our udev ptr */