From nobody Tue Jun 23 06:46:51 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 4gkwbJ196Qz6jTtK for ; Tue, 23 Jun 2026 06:46: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkwbH5lq8z4PtC for ; Tue, 23 Jun 2026 06:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782197211; 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=PZXAdsjmHX3gpj7HSeAfJM8V7/L4Zs8FBD7W7mUBsi4=; b=hxPDRgXy2eDOZS1MEV84CNbKXF0jljWv5toHCso9+d8gmJcr4Wjn2JeAaUhYyfV+1zNyMk 0NnE1eeFLmo/QIqRfCR4rzm8kS7wLooxf3eyfrrvC0a7GOqOXKJ6KnDJ3yzHSll9fAtJUr Vp7QVAZh+A5/nmnz5V3dx1WJQmPcIrUro5Z31mZrVSHcT2FqmgMpT3X0Mfk/ppGyJDaaU9 YaPhq7wBo5DiW58yTI205YpBQhxitAmQe89K1eWUCWp0mukRrY+8caFiWVku1zWw7M6pS/ bL9o4lP9KcZkTHuA75MYv+SYVt+rZpQFVbSd7rQ4xuLFg6Vm41NBmw456vhq6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782197211; a=rsa-sha256; cv=none; b=xpN0kVecOlVF/TgvuhTAkCCy66PIZjLvv3ajPe2YzdGCWjm+9Y2+pKhTyysn0OugikjM7N dgPNjhmrX9MklRPTN3XPa+xZU85ktz1oMb6r1ix7cRa9AS7N9bLbBupyKTVbiilZDabnFV HUzCkjTan75m5msVyxmH+7C/BdT8uAJpH8EULT9upvLdIxfBZz/7N3HLWo+d9ksnORMPn1 A69ZDz7yFWzBFdH/Bps4YrQkhH49gBT7KAnAAdW1y5YizChjrxO8NSfXIWBsjudeU3I5gS ywQW1vzWxA/gqDRLjWHGhvgWkME3dB9VolCjYFE2/5AJs1kW1jHPb1gbb7+xSA== 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=1782197211; 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=PZXAdsjmHX3gpj7HSeAfJM8V7/L4Zs8FBD7W7mUBsi4=; b=KhOmrVidsQKMrYwY5DddKUC7zvlxL9B+UfMUDEExxvQgAVxfV4kRuzH4l5hw3J/JLkTltn hqTSGBI+X1AfVNNkbEhLtCcSnDj8SCXOa9xr/PfQ87qCKYYyocNskS2uT+8PH4102aJWwi nOrdO10FnWJerYG8CfA1CFZxxS3Yugmc0MQY87WAwD76kkgrdtH5K7tt+DHJvtSvn03jZS qqJK62n0lNcNqttZmxTG5dhvgiaI0/3sa4KHkZf5mVagjzbEVBIQwqVFWttwy8UnRfDGr8 lzsvvy8kuQVD1CivcMvv0cZ87s60X2Cn9kWnqVkINT4r68d/lthHKdx/ndv5RA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkwbH3kM2z6p6 for ; Tue, 23 Jun 2026 06:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3900b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 06:46:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 26a94ad8fb31 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 26a94ad8fb317152ea9aaaba0760bbeb658d17dd Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 06:46:51 +0000 Message-Id: <6a3a2bdb.3900b.6655c9ff@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=26a94ad8fb317152ea9aaaba0760bbeb658d17dd commit 26a94ad8fb317152ea9aaaba0760bbeb658d17dd Author: Kristof Provost AuthorDate: 2026-06-06 13:44:17 +0000 Commit: Kristof Provost CommitDate: 2026-06-23 06:38:04 +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 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