External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

node_device_udev: Fix leak of mdevctlLock, udevThreadCond, and mdevCtlMonitors

Browse Source 
Even if `priv->udev_monitor` was never initialized, the mdevctlLock, udevThread
were. Therefore let's match the order of releasing the resources the order of
allocating the resources in `nodeStateInitialize`.

In addition, use `g_steal_pointer` in `g_list_free_full`.

Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
This commit is contained in:
Marc Hartmayer 2024-04-23 20:08:58 +02:00 committed by Jonathon Jongsma
parent 4daa362706
commit 6e727d8bdc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/node_device/node_device_udev.c
View File

@ -88,6 +88,10 @@ udevEventDataDispose(void *obj)
g_clear_pointer(&priv->initThread, g_free); g_clear_pointer(&priv->initThread, g_free);
VIR_WITH_MUTEX_LOCK_GUARD(&priv->mdevctlLock) {
g_list_free_full(g_steal_pointer(&priv->mdevctlMonitors), g_object_unref);
}
if (priv->watch != -1) if (priv->watch != -1)
virEventRemoveHandle(priv->watch); virEventRemoveHandle(priv->watch);
@ -96,16 +100,12 @@ udevEventDataDispose(void *obj)
g_clear_pointer(&priv->udevThread, g_free); g_clear_pointer(&priv->udevThread, g_free);
if (!priv->udev_monitor) if (priv->udev_monitor) {
return; udev = udev_monitor_get_udev(priv->udev_monitor);
udev_monitor_unref(priv->udev_monitor);
udev = udev_monitor_get_udev(priv->udev_monitor); udev_unref(udev);
udev_monitor_unref(priv->udev_monitor);
udev_unref(udev);
VIR_WITH_MUTEX_LOCK_GUARD(&priv->mdevctlLock) {
g_list_free_full(priv->mdevctlMonitors, g_object_unref);
} }
virMutexDestroy(&priv->mdevctlLock); virMutexDestroy(&priv->mdevctlLock);
virCondDestroy(&priv->udevThreadCond); virCondDestroy(&priv->udevThreadCond);