From: Erik Skultety Date: Thu, 7 Jan 2021 15:48:40 +0000 (+0100) Subject: hostdev: Update mdev pointer reference after checking device type X-Git-Tag: v7.0.0-rc1~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=964738cff3d949d90fc5c3317a2618fcd8d217b4;p=thirdparty%2Flibvirt.git hostdev: Update mdev pointer reference after checking device type We set the pointer to some garbage packed structure data without knowing whether we were actually handling the type of device we expected to be handling. On its own, this was harmless, because we'd never use the pointer as we'd skip the device if it were not the expected type. However, it's better to make the logic even more explicit - we first check the device and only when we're sure we have the expected type we then update the pointer shortcut. Signed-off-by: Erik Skultety Reviewed-by: Ján Tomko --- diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c index 120187b07a..aa3fc8738f 100644 --- a/src/hypervisor/virhostdev.c +++ b/src/hypervisor/virhostdev.c @@ -1980,11 +1980,11 @@ virHostdevReAttachMediatedDevices(virHostdevManagerPtr mgr, virDomainHostdevSubsysMediatedDevPtr mdevsrc; virDomainHostdevDefPtr hostdev = hostdevs[i]; - mdevsrc = &hostdev->source.subsys.u.mdev; - if (!virHostdevIsMdevDevice(hostdev)) continue; + mdevsrc = &hostdev->source.subsys.u.mdev; + if (!(mdev = virMediatedDeviceNew(mdevsrc->uuidstr, mdevsrc->model))) continue;