External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 13:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: grab driver lock earlier during init (bz96649)

Browse Source 
This patch is in relation to Bug 966449:

https://bugzilla.redhat.com/show_bug.cgi?id=966449

This is a patch addressing the coredump.

Thread 1 must be calling  nwfilterDriverRemoveDBusMatches(). It does so with
nwfilterDriverLock held. In the patch below I am now moving the
nwfilterDriverLock(driverState) further up so that the initialization, which
seems to either take a long time or is entirely stuck, occurs with the lock
held and the shutdown cannot occur at the same time.

Remove the lock in virNWFilterDriverIsWatchingFirewallD to avoid
double-locking.

(cherry picked from commit 0ec376c20a42b9eb365c1f9a5596366023c20c35)
This commit is contained in:
Stefan Berger 2013-06-04 14:50:20 -04:00 committed by Cole Robinson
parent ab7e3039e0
commit 12f18158c7
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nwfilter/nwfilter_driver.c
View File

@ -190,6 +190,8 @@ nwfilterStateInitialize(bool privileged,
if (!privileged) if (!privileged)
return 0; return 0;
nwfilterDriverLock(driverState);
if (virNWFilterIPAddrMapInit() < 0) if (virNWFilterIPAddrMapInit() < 0)
goto err_free_driverstate; goto err_free_driverstate;
if (virNWFilterLearnInit() < 0) if (virNWFilterLearnInit() < 0)
@ -202,8 +204,6 @@ nwfilterStateInitialize(bool privileged,
if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB) < 0) if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB) < 0)
goto err_techdrivers_shutdown; goto err_techdrivers_shutdown;
nwfilterDriverLock(driverState);
/* /*
* startup the DBus late so we don't get a reload signal while * startup the DBus late so we don't get a reload signal while
* initializing * initializing
@ -315,16 +315,10 @@ nwfilterStateReload(void) {
bool bool
virNWFilterDriverIsWatchingFirewallD(void) virNWFilterDriverIsWatchingFirewallD(void)
{ {
bool ret;
if (!driverState) if (!driverState)
return false; return false;
nwfilterDriverLock(driverState); return driverState->watchingFirewallD;
ret = driverState->watchingFirewallD;
nwfilterDriverUnlock(driverState);
return ret;
} }
/** /**