h 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 4dKxt24dSJz3H76 for ; Mon, 01 Dec 2025 21:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764624682; 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=xor8iKcPQNa6g8Hzu4FGn3zH/vhOb5mqbpVdToJc7LI=; b=HbXKhQ3dTk6XUx8YCtBsthbmWCUTqNydSSnFvolOwZnxq7VnEvRzTBO24eq1um+ZpTfv+I mUrG8RmQRYbZPBKocfO0cqpqPbX1E/cQgxnyIAvaQjGLSUuRJ2kmSot6AknXadD/K8nUjg 6OnMr2Qw/iF25SdSg4HgHoY2hwnJ+Q8ZeDVx2uBbujfVXt9Vr3JiNnyGHqGdaBDQURpaJ1 58rtjeouoZssKwlBcLqVbi/tDC2WG7LJql0nJd4Fpphnkz9JVflFAyL7qdvvOAaWOc0grx wDn2IiUoBK4oSYb1O9znw7RKr+jFIdWG76ZaFxbxraSy8MeRk0T3HITu/Ju+cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764624682; 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=xor8iKcPQNa6g8Hzu4FGn3zH/vhOb5mqbpVdToJc7LI=; b=aRm5HbloSYrMbxtrOjByNuMHpO7639MY1ISUbCCLaqNnHUA8oGPkkHdDg9Iem0zDlvE6AM CP5+VFpEO3WbRjjGvmERuyTO9JeKunBiC0NUVZPwDmeLNwI5gEfjUnjckxIK/VznscvepD n+9jzo1LCD5EUtacTBEZu2ARnozBGuBNxE1JQakA6tBvtbX9tC5CttvhxqgfYSvzYM6sHt vkBMEhCWXpVEsZK667RkIb9ALlr8NRO78QD6aYeDV9iCwM4hOb6R2Km40m+lI+gK8Z7nIY P4f2sM9o4QXmZTo/Oz2A8DqCLMy6gRt9g/8695gxLzLzMyLqC7IImjLqFIsVdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764624682; a=rsa-sha256; cv=none; b=NGVs0jlizPJXAIVBlEqHYt425BkYIqPPBAnui4M8CT+R9NIuOz1T+09FHt2edGYM2uZCrF 1BdOpR38lJAlxfhADrNKKGxN4QlQDmCzTXuUnI0ST/Qv19Wu3zCeQpaAWabQdFeyEmNLA1 FMqbCys18IbERrKCKNTJ250CSkB7cxBAAsAf58bwdL2jVYHcMtQGRYKUWmY1etoWP0aQ2x wo20EHIoangqrFPppmcuVrT5r/EYny9p+r7ptoQrCFnzH6Gh+OKyStZ9XzHOvhbx5HrY2A XNCKzHa/3Kv5eDmLTi6Og+JUQBisidVRFj2jNVR4mLduSkSgsozRDirzo8NydQ== 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 4dKxt24BHYzdyX for ; Mon, 01 Dec 2025 21:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 344f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 21:31:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 639e65144aa7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 639e65144aa71cb03b5431861803f528308760dc Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 21:31:22 +0000 Message-Id: <692e092a.344f5.30b2413f@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=639e65144aa71cb03b5431861803f528308760dc commit 639e65144aa71cb03b5431861803f528308760dc Author: Kristof Provost AuthorDate: 2025-12-01 21:30:56 +0000 Commit: Kristof Provost CommitDate: 2025-12-01 21:30:56 +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 --- 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));