External/libvirt
1
0
Fork 0
Code

lxc_process: Avoid passing NULL iface->iname

Browse Source 
A followon to commit id: 68dceb635 - if iface->iname is NULL, then
neither virNetDevOpenvswitchRemovePort() nor virNetDevVethDelete()
should be called.  Found by Coverity.
This commit is contained in:
John Ferlan 2013-01-22 17:09:26 -05:00 committed by Peter Krempa
parent 2e774db80e
commit 73cdac3f72
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lxc/lxc_process.c
View File

@ -262,13 +262,15 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver,
for (i = 0 ; i < vm->def->nnets ; i++) { for (i = 0 ; i < vm->def->nnets ; i++) {
virDomainNetDefPtr iface = vm->def->nets[i]; virDomainNetDefPtr iface = vm->def->nets[i];
vport = virDomainNetGetActualVirtPortProfile(iface); vport = virDomainNetGetActualVirtPortProfile(iface);
if (iface->ifname) if (iface->ifname) {
ignore_value(virNetDevSetOnline(iface->ifname, false)); ignore_value(virNetDevSetOnline(iface->ifname, false));
if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) if (vport &&
ignore_value(virNetDevOpenvswitchRemovePort( vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH)
virDomainNetGetActualBridgeName(iface), ignore_value(virNetDevOpenvswitchRemovePort(
iface->ifname)); virDomainNetGetActualBridgeName(iface),
ignore_value(virNetDevVethDelete(iface->ifname)); iface->ifname));
ignore_value(virNetDevVethDelete(iface->ifname));
}
networkReleaseActualDevice(iface); networkReleaseActualDevice(iface);
} }