upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-14 19:20:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pfsync: fix incorrect unlock during destroy

Browse source 
During pfsync_clone_destroy() we clean up pending packets. This
may involve calling pfsync_undefer() or callout_drain(). We may not
hold the bucket lock during callout_drain(), but must hold it during
pfsync_undefer().

We incorrectly always released the lock, leading to assertion failures
during cleanup if there were pending deferred packets.

MFC after:	1 week
Sponsored by:	Orange Business Services

(cherry picked from commit 639e65144aa71cb03b5431861803f528308760dc)
This commit is contained in:
Kristof Provost 2025-12-01 22:30:56 +01:00 committed by Franco Fichtner
parent ad8bca7fd8
commit 85e7e2c8e8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/netpfil/pf/if_pfsync.c
View file

@ -457,13 +457,13 @@ pfsync_clone_destroy(struct ifnet *ifp)
TAILQ_FIRST(&b->b_deferrals);
ret = callout_stop(&pd->pd_tmo);
PFSYNC_BUCKET_UNLOCK(b);
if (ret > 0) {
pfsync_undefer(pd, 1);
} else {
PFSYNC_BUCKET_UNLOCK(b);
callout_drain(&pd->pd_tmo);
PFSYNC_BUCKET_LOCK(b);
}
PFSYNC_BUCKET_LOCK(b);
}
MPASS(b->b_deferred == 0);
MPASS(TAILQ_EMPTY(&b->b_deferrals));