From nobody Mon Jun 8 09:07:52 2026 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 4gYmR23380z6fgBL for ; Mon, 08 Jun 2026 09:07:58 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gYmR21BQ3z3hRB for ; Mon, 08 Jun 2026 09:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780909678; 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=xLqZd9Lje/UFJc44g2cQIAByA4/p3q3MOg/x3vlXglU=; b=OolBjnZZW9aiV9f1MawDaRbw8xttwg9bEQRH1IdG9g0hXs/mTUgIxMrDXn9rPTsN+sHYsM LE1sX5opZcjV4B3gRJ44QjDPApO84zzPU5GFyT8roNPgyP90+iNRH1lYjFk682wNmQ4YQm tbbnr91alk5o44SpasEuPFE4rbgQzFHTcqukcdCCsYZMc7VdpU3xkljN+2OlD/cBBk724t 0dVBkwf6K2liHbdkmI4oe6+C5QFh2g66WUWiaj4X0vxKzfID/HTXFlF/x5oMytd3Mcf2Nm jwuIwAf4RlkP/idxy3r6VpQgKH7/71dD41VKk5T+0ZQ5rsSVQa5m4zNqfSWHNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780909678; a=rsa-sha256; cv=none; b=Ro/BRynqmmgWcx3JTlhfGTEoF8V/ULPl3oo54PZJ8t5cnnBRalX2EYOW2lOwXAhonxUroL gOc6OBLs+yqXLeLJSArnImnKI2N3BjprtvgLk3GZODzBek2sxLriWyu/KQdkNazJuNoEP7 wKOgq+Y9z+SJNxi5XAToocs9XHtkcZf/svorsO2+u4dqQHXPMIQN5D2bA3TuRCwwbOKHwf rNQMNwMkpgPGBARy8QDWlvtIolYPe81k8VzoceOVUhY1llDTYG58BtUhr09wZ9Hh3SV/Ch 40q4u9Knja0DMLq6o5qCp3DjApHNvcLi1tI7hSrHc66PFUkS4UuCzBK9Wc5pGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780909678; 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=xLqZd9Lje/UFJc44g2cQIAByA4/p3q3MOg/x3vlXglU=; b=cJ/CfSmLjiGq17FHT3NedJcAYg+zej/WQ2n5MDsoWcy71CIuYQL3tp1AUQrzetbVGBHMj2 OhJV4S46/Gfn7cF4Yg6WkKHuHYeydeeBwp+dtYzF3Bzs5PMoWTsTLdR0ofNRbrPvKagRC7 n6TuBYPhyBzt6fpiPWWPx9HB/7e4RV3fHjrEenSY8l85v3vUfMHvThdUxZc27Teqd7Dg84 54AW5at5gc+7aOkb6aLVF3eciVZNJmVBf3B6uYq/bbF4gmR3FiOEXDh4sW13lCJgvHz3Of tYI50T9a2i3MXwPCKTDq1fp1Dn1ncLKF4SSPqlg7LCT0r8KxB6oJDPFPYdZnBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gYmR20knczj85 for ; Mon, 08 Jun 2026 09:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bd61 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Jun 2026 09:07:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 035e87247f84 - main - pfsync: remove invalid panic 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 035e87247f845500b4672e10efb8f47fd2c0f2a2 Auto-Submitted: auto-generated Date: Mon, 08 Jun 2026 09:07:52 +0000 Message-Id: <6a268668.1bd61.55977035@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=035e87247f845500b4672e10efb8f47fd2c0f2a2 commit 035e87247f845500b4672e10efb8f47fd2c0f2a2 Author: Kristof Provost AuthorDate: 2026-06-06 13:44:17 +0000 Commit: Kristof Provost CommitDate: 2026-06-08 07:44:56 +0000 pfsync: remove invalid panic When we undefer a packet (when the peer acks the state) it's possible that we don't find a corresponding pfsync_deferral. We panic here, but that's actually something that can happen in normal operation: - if we have too many deferred packets already (in pfsync_defer()) - if the deferral timed out (in pfsync_defer_tmo()) Remove this panic and document the scenarios where it might occur. MFC after: 2 weeks Sponsored by: Orange Business Services --- sys/netpfil/pf/if_pfsync.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index a5f377e84307..a64d0ef64a61 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -2356,7 +2356,11 @@ pfsync_undefer_state_locked(struct pf_kstate *st, int drop) } } - panic("%s: unable to find deferred state", __func__); + /* + * If we don't find this state in b_deferrals that might be because we + * overflowed the list (see pfsync_defer()'s >= 128 check') or because + * the deferral timed out already (see pfsync_defer_tomo()). + */ } static void