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

virNWFilterSnoopState: Prevent mutex leak

Browse Source 
virNWFilterDHCPSnoopShutdown would never destroy the mutexes created
in virNWFilterDHCPSnoopInit. Additionally, if in virNWFilterDHCPSnoopInit
the call to virMutexInitRecursive succeeds and the call to virMutexInit
fails, this would lead to either virNWFilterSnoopState.snoopLock being
initialized twice or virNWFilterSnoopState.activeLock destroyed without
being initialized first.

This enables a later patch to use virNWFilterDHCPSnoopShutdown as a
cleanup function safely, as it is a no-op if virNWFilterSnoopState was
not yet initialized.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2022-04-08 12:50:35 +02:00
parent db2989c3a5
commit 879ecd602f
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nwfilter/nwfilter_dhcpsnoop.c
View File

@ -1860,10 +1860,14 @@ virNWFilterDHCPSnoopInit(void)
VIR_DEBUG("Initializing DHCP snooping");
if (virMutexInitRecursive(&virNWFilterSnoopState.snoopLock) < 0 ||
virMutexInit(&virNWFilterSnoopState.activeLock) < 0)
if (virMutexInitRecursive(&virNWFilterSnoopState.snoopLock) < 0)
return -1;
if (virMutexInit(&virNWFilterSnoopState.activeLock) < 0) {
virMutexDestroy(&virNWFilterSnoopState.snoopLock);
return -1;
}
virNWFilterSnoopState.ifnameToKey = virHashNew(NULL);
virNWFilterSnoopState.active = virHashNew(NULL);
virNWFilterSnoopState.snoopReqs =
@ -1938,6 +1942,9 @@ virNWFilterDHCPSnoopEnd(const char *ifname)
void
virNWFilterDHCPSnoopShutdown(void)
{
if (!virNWFilterSnoopState.snoopReqs)
return;
virNWFilterSnoopEndThreads();
virNWFilterSnoopJoinThreads();
@ -1947,9 +1954,13 @@ virNWFilterDHCPSnoopShutdown(void)
g_clear_pointer(&virNWFilterSnoopState.snoopReqs, g_hash_table_unref);
}
virMutexDestroy(&virNWFilterSnoopState.snoopLock);
VIR_WITH_MUTEX_LOCK_GUARD(&virNWFilterSnoopState.activeLock) {
g_clear_pointer(&virNWFilterSnoopState.active, g_hash_table_unref);
}
virMutexDestroy(&virNWFilterSnoopState.activeLock);
}
#else /* WITH_LIBPCAP */