From nobody Tue Dec 9 11:18:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dQbvP4dpLz6KQVn for ; Tue, 09 Dec 2025 11:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dQbvP25R8z3VsC for ; Tue, 09 Dec 2025 11:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765279121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rwLj5vb+KWp0ml2V5Mx++VZaiUJSontgMepgvkKSHjE=; b=XQYcwXbYcY69UOMmgr08KNtAd4Xuk9CmSjUAJQKCB1lzvkGGVuy8Rp5JcqpzAOxaRbPlhY U3zCv2qtP1FGLF9cs8lFRZVP17pEoQWuw0BEk5GND2bBIYkFIbROIqiBdItV782F9r2vtb 36xQeHs8zgfRoOnbJP2ORlsIhnoyw/lT7UOc1vDrtUQRdKxYanqTrj4J7JE8s6u/89KT9D dK1EaeszQin0x+GM5Scu6ZGbUzQ5tA/Mi+KmtXUOOkLTeisx0YC4YtFg2kOBOhhwHl9HMC s1AhX+behC3xSnY+1L+PAPnYXKQvs0TnOK/laFXS1/IfSWnH0tDAKc0SvWxoYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765279121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rwLj5vb+KWp0ml2V5Mx++VZaiUJSontgMepgvkKSHjE=; b=CWSitcv6GOp2/aI+GN8BYf1XeMtz3FheM5Fy8setKncix73+ymLZC1aUr9UuFlXTlAKZHL NXWfovISe6Z8plEZDuX7/26k3sf9SA2t80MTykqUfFAxy3mZicNDzDY1VEnCbgTgXScedC LZbOhoK6g+vGG4UehvR/Mqw+FtuDKXA5g2Atfzi03V5hBAIM+27Kh//5AL681pKuDG2WbK CRLG517CrU9f3PX/+VVdfZhh+lR2bxhhE6aEkD3xbZmrmxgkEIrhG6ucQCuWTxQn8mmr3b R4PVBYQr/e8RDbhiNgoWXbbuOeSM1gWuYcSCBBNMY6UMgKHpJnizHHFTE5CqXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765279121; a=rsa-sha256; cv=none; b=Bk0uPC62rENQJZfCn82/KytUpHi0V6cllEi4lN6A2haELI/coMRDajK4I2SfeiOvFSDLik ZsKHmXxsHhRUPDWaopnzcnUWnb++xHH1BOQNFIPv6CxoND+sH3+8SH4zHGyWq5CGN3poYg FlMpJCtWZOeSEjXOKp0wZES3Mxco0ySXb2E99WESbAkFrg7O7mFMK6UrQcMCVYV/Kd2jpN W2f9B55AmB3Rvb/vLRVitCLl1CnWd8qq4hZyARkwXSbY2FkBlJutlFsUgdm3q6hOQIS0RS ogdyWpVF5KMpee0/PZUTYZUlRxTZsjaJHQKiVmt3tX6u3bbMgQE8RWV1xF1BoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQbvP1f56zwgM for ; Tue, 09 Dec 2025 11:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ff9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 11:18:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: b2d547abb76f - stable/14 - pfsync: fix incorrect unlock during destroy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b2d547abb76fb4e88c0fb58b50b8dfaf5447d737 Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 11:18:41 +0000 Message-Id: <69380591.3ff9e.6d3ced3b@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b2d547abb76fb4e88c0fb58b50b8dfaf5447d737 commit b2d547abb76fb4e88c0fb58b50b8dfaf5447d737 Author: Kristof Provost AuthorDate: 2025-12-01 21:30:56 +0000 Commit: Kristof Provost CommitDate: 2025-12-09 10:29:27 +0000 pfsync: fix incorrect unlock during destroy 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) --- sys/netpfil/pf/if_pfsync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 2a5cb0612d36..cf46a8da94df 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -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));