From nobody Mon Jun 8 09:07:52 2026 X-Original-To: dev-commits-src-main@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 4gYmQw6WZBz6fg0x for ; Mon, 08 Jun 2026 09:07:52 +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 4gYmQw62w2z3hDq for ; Mon, 08 Jun 2026 09:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780909672; 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=INgyQ8gQro1Kh9FGRy8RYgpt2F0Mqkj7N8XamSdrbzo02V5jBzjgADHY9WjB9HR9jZcQdO HwUiLiybQNISOaOMne5+EA2Pf6hGGF3XwluDZvSxtwZIm2z+fo+idZVX/upGZIP2s6LWM1 qfOihJ21xcn0V3rT+itKlwVZNiEOyQpqjk4W6Pnwq18tzM9MQYa4KvCuxF8XRAqmNJ341/ gU/VtTWE7VMETWQQBB4BjoUUaePCqbSVwxy5qQp8P4YIwhefx3rRZBC1/Q90z/V9t2eXGP 5njPYVgYv9V4Ye/A7E+rKXYo0wnqYRPRLJ7koL+FDDwrWzuZtYiqJUmR9jPfzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780909672; a=rsa-sha256; cv=none; b=qmTMdE7eeNrZc5QTeh/2zSRZVEdGQgBRjZII/yxoGN+ZszQ5JwT2FOe6gDYAouBQyCGmkT e6evpHztspMuDW9+khj2VQwFz+TuaMXEFqgttvtT5dGpWnD6RLnmGtGYpr1dpTmUIiUXEH zXTqV3dmVP/A65nUL3M+rNQ9MUDrvduIXs7iyfjyAdDWRP25/1dRhOcFjHrHJ8knjrvt7Z TIJ9hoU37feOUtIlKFhNCe2CUcTpTyylWTfiJMG4gxKuwnTC6B11fojAMBt/jxieee5MgB OT9QH+H9yjvuyF5l8C1n1m0E5oNDwYoOF1fiW6C3ZkNbE6nmgPJNnvgrb43kyg== 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=1780909672; 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=bHhbar3dorEaMHTiEQrfviJn1G3CoNq986eAtIDBJ7+Ytx4a45+ObdgCTiyShuJVWqe8b4 cLdHqhp1K1XcKIluGpyEnaQP7UogBwnVgo3xDHSZvyRx6ppI16UtfkGi26l7FkJ/kLjczg oVRKeVVX7wFE3TTIXokMskr3DXC7FQ0+64hiwc0SB1v2JwFQ5Nv2G1FgWXL+6wH4oKfvui /HKo/fshkdwGkjvgPIpekvWGbN+c0mhdiY8NOlm4bANywfGtEOfFQV4Pc+y7HnBtS3Jh4i Gr73BD38qNzM+hmSZllKOb/ZUdooedG4wG1sMRGxTo59/a6c9ph8wM6HZmMFGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gYmQw5dyDzj84 for ; Mon, 08 Jun 2026 09:07:52 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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