From nobody Tue Jun 23 06:46:50 2026 X-Original-To: dev-commits-src-branches@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 4gkwbH18LNz6jTr4 for ; Tue, 23 Jun 2026 06:46:51 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkwbG5yxnz4Q7m for ; Tue, 23 Jun 2026 06:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782197210; 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=sUVmCUHtqMEWOhEODdI5tRVkT+d9MCwAYcv+N5BOMfI=; b=lrtOdNoBO3BH+DSSTJwPZ7znwVRPa6MvtWIkMKAmUJWHt2eehak9/xi2SMcLfYQbNS4kFn +Pk1cIBzLuZwmUwEWJNG4jq5m5TrpQbvcapwIuW9jWs6bYcMRDmftr528MtmbryA8ENs9H lPiRNKAy72kll7RvMk5wL2s4WI9t4lf4WlxdV+Z4rHqePg2mzcs2AOZpguXyX00v8ZSk7a 0tPIUeTBAZhGNaAavbFA0Nn6GvE2VgGnMqpEzHwRoOY3IuWwiG9oDZQDnxV7rDQmkzR7kF O3QJVqJzW8JM2zwAmw4bumaChn9nf+ZpZ+ihvbtxKcUdALko1STRopEk5lBS9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782197210; a=rsa-sha256; cv=none; b=GCg82yVCe5cUAOKPbNnLe507zTs19Y2QCArkJA32c2xHJ1gzOHZlsa75xTc3xE9CXU4mlx bTb6QSGt7nYvypEqyMHMIvYaYlA9B5CBexfOteXvI4ymCT2ndB0KBEDpRr5lDtF380hjpU +gGH4T6SkiRhJWMxbgHdaWl2oEEZ98yPcNrAXRTqkQhOgU4xhBZDT5yLz/lVh17zTnJIjW 4fU6fYS7b3AxX5q3RdHMWGpTWEMPRpcRWroWPZHaScFmoZIsgiqlI49LzAYHsajndazUQL h/FIYh1RSmAnazAdhpLb3wByDrACIxXuxOMnITVkORsEn2hp62HmRlTbN3YXSA== 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=1782197210; 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=sUVmCUHtqMEWOhEODdI5tRVkT+d9MCwAYcv+N5BOMfI=; b=QtNyPN/PddYBXZTd+7t2paAyulJ1LOpsO1nKzljXq/a7FpVAa4ueCaDJtMB8BZWpC3jWc5 iTAkF7V/4K+2n8RLq6jLWvL1MY8cySvTt+5/IDY6DdNcTLptT2jSveRxvXx1GtCFpvwhzz NlmFlsIe0cmQJYNA/42V9nek02VzasJ9t6CeLc8lIX7XweviL4ZwgrgTilAdOK6BKmwV4A HSiiaKBp6z0VEgB7sER0aGr+tXluUJ3F654Dg+x/v4H5LtfWIF+tMHkaotDscaC6mKmQUv PywdLmRKQbXRE1svRMZFsCBTa3FSoKXmeRNugist45FYBEjdKNQuOdea9LbliQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkwbG4KvLz7NK for ; Tue, 23 Jun 2026 06:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37dd7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 06:46:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f4e2f07f0cbc - stable/14 - pfsync: remove invalid panic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: f4e2f07f0cbc976e5a894ab4f3dbbccb15e06d46 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 06:46:50 +0000 Message-Id: <6a3a2bda.37dd7.7a1859a@gitrepo.freebsd.org> The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f4e2f07f0cbc976e5a894ab4f3dbbccb15e06d46 commit f4e2f07f0cbc976e5a894ab4f3dbbccb15e06d46 Author: Kristof Provost AuthorDate: 2026-06-06 13:44:17 +0000 Commit: Kristof Provost CommitDate: 2026-06-23 06:37:59 +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 (cherry picked from commit 035e87247f845500b4672e10efb8f47fd2c0f2a2) --- 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 10883e233b03..4d83962abc74 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -2147,7 +2147,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