From nobody Tue Dec 9 11:18:42 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 4dQbvQ5xNtz6KQ0m for ; Tue, 09 Dec 2025 11:18:42 +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 4dQbvQ3mPdz3Vy3 for ; Tue, 09 Dec 2025 11:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765279122; 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=s4eoDlmROCJe5SVcUThx72jye+n/fwsm7Ee/7kWLNk0=; b=AaY9xvjACytLIP7OD/bhIvDJzd0cgZ/WI7jgP0eucsnxu+VL3g+a4m9lnWysz39QtDObLT i+Ler1BUoaV0OSGuZSHKhA//GGoZ0z6vIQK8e7oZys5QwGgM88+895/1UmKSGTPyl42F47 vJ4lDJdXkid/6Rhwnnga+yvT1C/2hkIcmXba0Kaprc9pXUXa8kHdmqrbkcVvDYnL9FO2k1 hGyGvKy2hqr5xRav5AEqnb460NIGZbdWYV1mmGUmtMkq0KsVnmZ+OvAMZtqGnjK2spVdxB dSBkVHRQukR3dD53AjTZT1R1zCVd6wLu41G9hVzHLf5XJsFMU4dOI7q2gklqkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765279122; 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=s4eoDlmROCJe5SVcUThx72jye+n/fwsm7Ee/7kWLNk0=; b=EtPidjUctDUA+xCd78Lu+JZQxlH1VRAGE8OJDCjTxM2EZyoOPAu9foVH/lEOdEj/1+82cR 9WV3bUz3wfRpwyuuPExh2vR5bzTzJpAcjh+mvEypkNo1Ob/Lw07t6MEwQvHXzWEwj8e/Gh vt+eqB397NwohO40K0lsfmqubFAqJH6vZtHmyAUxSl5X6lUpc29sj2HIlcY9ezGVeCDtn1 diOisAkm5m1dAVfz96QENi/V54dFXpf8cWPEisCF8L3NZrGp3dIc/Ykhr5fhNA/icmHfXv jDv3F3btLlUgBdD1k7fjDH1RApNSK1qBvdIRY3FASkDPdbnSi22/Qxea3cIeLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765279122; a=rsa-sha256; cv=none; b=TJOHqZxjuTjUvY+Xxmmn5Hppx5zW5BbN67bJuLzMLPM8a37JxpkG13tQsaJfT0oJrb0wnQ c+1wgdAJx3k+WRbRqZq7tvAYW7Q+mbfNZh269V6z2anm9sUXEjx6c++IJ6jwf2g8n+cp6f mfkWnCNLevq7AyXFYiwiMVscxTFJUBs22LPFmSWccYjJHnhlhe2UztbYbwG1lIOMTB0Rdj 9UWfd9AK9+Ka/GkiUeSQpEKlYuwCJXb4SHJ3uFoqAVEoh39ZFqxyg4g53+Ou+SZoULDvrM 6ROm3souPiSI2ulZYaziYkZaSMnzbX4IxPW3+mzJhUljZyZxD5jWzFXLBIsWlw== 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 4dQbvQ3Lmwzw39 for ; Tue, 09 Dec 2025 11:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8c00 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 11:18:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: a06df4218348 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: a06df42183489627619fec45d26f799b1de1a12e Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 11:18:42 +0000 Message-Id: <69380592.8c00.4525180a@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a06df42183489627619fec45d26f799b1de1a12e commit a06df42183489627619fec45d26f799b1de1a12e Author: Kristof Provost AuthorDate: 2025-12-01 21:30:56 +0000 Commit: Kristof Provost CommitDate: 2025-12-09 10:47:33 +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 de69ecbb0985..b571734b4250 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -466,13 +466,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));