From nobody Tue Dec 9 11:18:40 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 4dQbvN5c2yz6KQPq for ; Tue, 09 Dec 2025 11:18:40 +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 4dQbvN51kfz3Vy1 for ; Tue, 09 Dec 2025 11:18:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765279120; 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=aa2naSnRgktQyVXpQqg+7MH3Xk9M057NQRztbpNRIY0=; b=RVlIo2+iSQwJsRuI0AuWqIIlzdfUBmOOJLctfbKPTGPRD9wG1DlY1WpUtoeqdsTPcQZ1iu A7MBobgW/kmB5jOj6RHYViP5B6F3ithvwMH/4PjaYBPFtHFmWV3it3/kUlug36VWkVX5Sq VNjiFvgFveHKu/dZVyCOoH5J4TMegk4Uk0pgDGC6vGb9QXixnwvZ9zCiHHL3O/xiFLQtGX WyG9qXGWlnDRhFoVRm9efWyUv/1xuCSJposSJLQ5/qk/ARh549UvnjJ66bmv2itVIFiXlg PFTd9XyU1KK50UY3IVKLvP4kXkQwCTquvjgEYl+mKFNZVE0PYSIJCsZbnnB7+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765279120; 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=aa2naSnRgktQyVXpQqg+7MH3Xk9M057NQRztbpNRIY0=; b=fJAEAYWeH0fMHIngAEtoj8Pibb6hvG1ZXZrLsv0s9py510z+FcZfjlJhi7BQOP5V0z7yDe BDAnb7XIsOxVw8Rn8yPVV9INuYAaBsvGhb9PCiWRn9W/N3dLzd5yMsDdcv/u5FjMpRfK6/ /hYcYs9cvUCZ6TX4sNpOcahsJ3r3P+Hl8uttIyrXkCQx9S5UFbpf/EKz6hoVzIdbWwMgbH sgb5USS5+3y2uFjUVtEq8ceRW6eSYt51JmPQ3Z8MKPqy8ApnQC9b7rc56ektmmgvFtrbNb ZL3Qk8bYqtcofdByIdZymn/xrGv+sA6PzH9DI3ARMsKnCK82U5PHW/LkaPIzKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765279120; a=rsa-sha256; cv=none; b=EHgZ7IF6b92Mnoa9bx/dW0GYNQGZEVkRsImpT8ANAmkOuErnhZt2gcFD/IQ3/FgM4FJOmu +T+Kn+mQDG3guS3uacmWLfNL/s67cyrFIXxYsck/iuIbEY4r7lcyhElGj8TdqzNViv3N4r L5m7UAgI9hNk7TmHYVGo1PF2nVPiBYsF4t1uvMzR13QQpDVX4ufGiSm+3r+0LZrZFk64P2 6AuCyZIwa9UqyJktay1ygqYmK/quy6xWfC8ZHf+rtRTatMWGe4FBduFaInTCXNB6gnAHaD /VzSkLZUDyHtVKc5wrEXKdVhaUBpYsQey98bmKPfyTJ/UID5qxLpbkLcONGKNQ== 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 4dQbvN4ZrdzwlX for ; Tue, 09 Dec 2025 11:18:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d6fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 11:18:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9b2551051fce - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 9b2551051fce2b56bcc8f4d03596205225d5832b Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 11:18:40 +0000 Message-Id: <69380590.3d6fc.268f7453@gitrepo.freebsd.org> The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9b2551051fce2b56bcc8f4d03596205225d5832b commit 9b2551051fce2b56bcc8f4d03596205225d5832b Author: Kristof Provost AuthorDate: 2025-12-01 21:30:56 +0000 Commit: Kristof Provost CommitDate: 2025-12-08 09:34:20 +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 c43cb59d8705..cc5b62d47df3 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -402,13 +402,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));