From nobody Tue Dec 05 18:26:11 2023 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 4Sl89w2LjLz53JJr; Tue, 5 Dec 2023 18:26:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl89w1Vx4z3YQ6; Tue, 5 Dec 2023 18:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800772; 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=0AYsK3r47Dylsqe6Yx4pXJfhnXrIPoHC4kdbEvebKzY=; b=yV+P0KBrHTxs2hQJauG7dd5iDCeFU4ce8iBpey+DN08+S3rJph8d5PQTHp4K0loXlo1VfB symbw0Ko/18S2PeQyeWSu6PozbU6rg/dK1iBuZRPWBuG5fO37zWPLvPJ+rruGva5eNdyco 8zCNvE5PojddCT77Qh2jdWtSuxf2VGzjvz+UA4dqtUoKIfOoHzqjwVWdjl8ZX0HXKZ77qi 58mcmRTKbHCQsEK/GiQ78xxjXexiOGpVLJxuKSNpEnM2KRvbJLuvl0PlmAodOXhEwrsZRj iThkml/qsa04yrg1wxhIXSNn7hPlLPlKmI3nqpyS6rGcidjSC6gR1xlhDHfIFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800772; a=rsa-sha256; cv=none; b=prmTfY4cC2frkBbxgglU6XWLe+4EbFgasCM6TLR4r+aaJWwKreDyI3ErMc0hOkON190UVZ Kn/BwzGoXoy1WmZzRtDM4rs55b3T6ZPGhJJtIP4ptTW+qPLUTriDP/7GR4y/fJlOUTniNe X6cxT1vq8SOR4RNKsvzHhuSodisnpM9o+0l358Dh681tK39AsrG0xSFkUjJazjzSD26VzR hlwgNbRJDVIHWPkniatNGwtKLo95lN+TvSiMVUUrDJBfrGuBIKvwsCOxhQ3Dstl1yn8FxU CjDgcX7u8UOrugNY3YE31nrr2ZCn/6Mibtcsj439qe0q0m70YhHb9Iw/5RVaGg== 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=1701800772; 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=0AYsK3r47Dylsqe6Yx4pXJfhnXrIPoHC4kdbEvebKzY=; b=WQGY0Sn+fJyjoTNbof29ncL0l4Z9HHCIFLezhpksxFUZgt+RTiVrNn3nAsoBSJcC85UYr5 jhkfHUxSVwyhHqojMnwwKMG+5bP/UIAj9o6ltBZcZ8iqBuyDVao3kRwUZLllxD9LnrBpdj pOw48vP23Yaz+DKBwQSdbs0GTJinmuJz2cvZbUs1imTfaZ93wJWAB+9lbKMe1Hc6jLIULZ 5umUP3DFhgO3qNhDMcNObt7CLK/iptcfttxhs5k7RONCznAXgIFCD/FMrXYuwoGlwxr7/E NRaOCIPO2/NFFxg8FxjSaxz+8a/DVxsRm2WPxc4Cjx5jy1NIPmj5nOTN9Jj+uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl89w0Zltz59t; Tue, 5 Dec 2023 18:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5IQBQb008671; Tue, 5 Dec 2023 18:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IQBin008668; Tue, 5 Dec 2023 18:26:11 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:26:11 GMT Message-Id: <202312051826.3B5IQBin008668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a47a44c0d69c - stable/14 - pf: remove incorrect fragmentation check 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a47a44c0d69ce82f302b02da940538a99b47037f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a47a44c0d69ce82f302b02da940538a99b47037f commit a47a44c0d69ce82f302b02da940538a99b47037f Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:24:35 +0000 pf: remove incorrect fragmentation check We do not need to check PFDESC_IP_REAS while tracking TCP state. Moreover, this check incorrectly considers no-data packets (e.g. RST) to be in-window when this flag is not set. Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:17.pf (cherry picked from commit 6284d5f76d6bd2d97fe287c5adabf59c79688eda) --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 84bd75276af7..e19370cc7333 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5367,8 +5367,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, (ackskew <= (MAXACKWINDOW << sws)) && /* Acking not more than one window forward */ ((th->th_flags & TH_RST) == 0 || orig_seq == src->seqlo || - (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo) || - (pd->flags & PFDESC_IP_REAS) == 0)) { + (orig_seq == src->seqlo + 1) || (orig_seq + 1 == src->seqlo))) { /* Require an exact/+1 sequence match on resets when possible */ if (dst->scrub || src->scrub) {