mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
qemu: Remove hostdev entry when freeing the depending network entry
When using a <interface type="network"> that points to a network with hostdev forwarding mode a hostdev alias is created for the network. This allias is inserted into the hostdev list, but is backed with a part of the network object that it is connected to. When a VM is being stopped qemuProcessStop() calls networkReleaseActualDevice() which eventually frees the memory for the hostdev object. Afterwards when the domain definition is being freed by virDomainDefFree() an invalid pointer is accessed by virDomainHostdevDefFree() and may cause a crash of the daemon. This patch removes the entry in the hostdev list before freeing the depending memory to avoid this issue. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1000973
This commit is contained in:
parent
8aecd35126
commit
50348e6edf
@ -9965,26 +9965,36 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net)
|
||||
return matchidx;
|
||||
}
|
||||
|
||||
virDomainNetDefPtr
|
||||
virDomainNetRemove(virDomainDefPtr def, size_t i)
|
||||
{
|
||||
virDomainNetDefPtr net = def->nets[i];
|
||||
|
||||
void
|
||||
virDomainNetRemoveHostdev(virDomainDefPtr def,
|
||||
virDomainNetDefPtr net)
|
||||
{
|
||||
if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
|
||||
/* hostdev net devices are normally also be in the hostdevs
|
||||
* array, but might have already been removed by the time we
|
||||
* get here.
|
||||
*/
|
||||
virDomainHostdevDefPtr hostdev = &net->data.hostdev.def;
|
||||
size_t h;
|
||||
size_t i;
|
||||
|
||||
for (h = 0; h < def->nhostdevs; h++) {
|
||||
if (def->hostdevs[h] == hostdev) {
|
||||
virDomainHostdevRemove(def, h);
|
||||
for (i = 0; i < def->nhostdevs; i++) {
|
||||
if (def->hostdevs[i] == hostdev) {
|
||||
virDomainHostdevRemove(def, i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
virDomainNetDefPtr
|
||||
virDomainNetRemove(virDomainDefPtr def, size_t i)
|
||||
{
|
||||
virDomainNetDefPtr net = def->nets[i];
|
||||
|
||||
virDomainNetRemoveHostdev(def, net);
|
||||
|
||||
if (def->nnets > 1) {
|
||||
memmove(def->nets + i,
|
||||
def->nets + i + 1,
|
||||
|
@ -2371,6 +2371,7 @@ int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net);
|
||||
virDomainNetDefPtr virDomainNetFind(virDomainDefPtr def, const char *device);
|
||||
int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net);
|
||||
virDomainNetDefPtr virDomainNetRemove(virDomainDefPtr def, size_t i);
|
||||
void virDomainNetRemoveHostdev(virDomainDefPtr def, virDomainNetDefPtr net);
|
||||
|
||||
int virDomainHostdevInsert(virDomainDefPtr def, virDomainHostdevDefPtr hostdev);
|
||||
virDomainHostdevDefPtr
|
||||
|
@ -303,6 +303,7 @@ virDomainNetGetActualVirtPortProfile;
|
||||
virDomainNetGetActualVlan;
|
||||
virDomainNetInsert;
|
||||
virDomainNetRemove;
|
||||
virDomainNetRemoveHostdev;
|
||||
virDomainNetTypeToString;
|
||||
virDomainNostateReasonTypeFromString;
|
||||
virDomainNostateReasonTypeToString;
|
||||
|
@ -1066,6 +1066,8 @@ cleanup:
|
||||
virDomainNetGetActualBridgeName(net), net->ifname));
|
||||
}
|
||||
|
||||
virDomainNetRemoveHostdev(vm->def, net);
|
||||
|
||||
networkReleaseActualDevice(net);
|
||||
}
|
||||
|
||||
@ -2107,6 +2109,9 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
|
||||
/* the changes above warrant replacing olddev with newdev in
|
||||
* the domain's nets list.
|
||||
*/
|
||||
|
||||
/* this function doesn't work with HOSTDEV networks yet, thus
|
||||
* no need to change the pointer in the hostdev structure */
|
||||
networkReleaseActualDevice(olddev);
|
||||
virDomainNetDefFree(olddev);
|
||||
/* move newdev into the nets list, and NULL it out from the
|
||||
|
@ -4259,6 +4259,8 @@ void qemuProcessStop(virQEMUDriverPtr driver,
|
||||
virDomainNetGetActualBridgeName(net),
|
||||
net->ifname));
|
||||
|
||||
/* kick the device out of the hostdev list too */
|
||||
virDomainNetRemoveHostdev(def, net);
|
||||
networkReleaseActualDevice(net);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user