From nobody Tue Dec 05 18:37:51 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 4Sl8RN0SmPz53K5G; Tue, 5 Dec 2023 18:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl8RM6zLQz3fw8; Tue, 5 Dec 2023 18:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801472; 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=RMTa6ynPMyhCcM+PKmfzvaV+bki8mrHWrJB2NdN/ugg=; b=PYlRz0VXffXN/J2Wd/IReo9PG70CjSoDyXkZI7J/ZWHSUwK93D7u9BcmIu711pQqM1wjq1 CPvwbdNuJeU6f88mN1RPQ0PgnaSc9Q/DZ+15mhctbTmTGUnHYGYiTHXSfmvPc/hzKByUAE b2z6VdEW6Q+8QTvEbPC1F3MvEyXLuX+6TFkE8FlpwfdatQAGAubbjUvjF7EGolYd5a2ooO EVYTO3pGl5EO1w+XWZ6SSuwkUAOqHww872oYLpK8GSTR5s+qhGbSeVEJjE9JNOx3BNpyAT 32t15vdXAN3zOYl5vwTx8DtxSdOpvWR7MAR8YcecwCB4ZJbTp5O27TwpzBTldw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801472; a=rsa-sha256; cv=none; b=Xt6ZoLRw51/BgFzez3+TZDZDzatQTFuF79Jrn6kJOtkjTUgFbTqnHZ3AS/ddtfEN3YIFZo wRhyV5CEHACxxbXE29TPM5jefDkr3Uq5D3wCgvs9izZHMtj00/j0JHAe3dlyF3SqLI743f WYeap+XwJjJe27+LfyFdqdmwCVbSGtsqwYGURP7q1f7XlnDC2NU1egiPVBabVR1X8OahIm 5t9Zvdte+JCihkHdp33RyziEAgsHRozkCVJQHN301ucRO8cNW9nAuqDeS4cEgVuCQ/+Lhk qb0BjNbaU5K8NTUp4vro/qUUSyUzxIoJ/47zbGbtVbvt30bFlJ3bKDXCHn6DDA== 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=1701801472; 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=RMTa6ynPMyhCcM+PKmfzvaV+bki8mrHWrJB2NdN/ugg=; b=P3RH9QmeN6Y17E/KE2ywr0nwj4nZiJ/OiT3TeRqSU45CnIRGUmnIkNKxg3VZGu0ohU6JZZ XGxxJUHm1DYMMeTgARg7X785+owfH/HBSALnuF3/U5m7enSN8zSPuXulhS4yUZ01ihwk8z UJ/8XKWn6vuMb1dZeRinbuD0o9CsPSOSXcF1f8jPctALFj2cNI7vOyKKWYQV8xGs14jEjz SkSwNl+zTimFjynpT++xkYavNjA2zH9Smyjzm/2KS0bd8MIfXu/CCVaSqE/afPA+KiLJVM N6KmiFtN7p4tw57FNZ+nen3grbY20zUIyviNjf9VmkUK1Znef7VgsE1zQx+tRA== 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 4Sl8RM62Gmz5Tw; Tue, 5 Dec 2023 18:37:51 +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 3B5IbpFp026746; Tue, 5 Dec 2023 18:37:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5Ibpww026743; Tue, 5 Dec 2023 18:37:51 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:37:51 GMT Message-Id: <202312051837.3B5Ibpww026743@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: f0327f9d86aa - releng/12.4 - 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/releng/12.4 X-Git-Reftype: branch X-Git-Commit: f0327f9d86aa54ab6de42ca7694899b97064bde7 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f0327f9d86aa54ab6de42ca7694899b97064bde7 commit f0327f9d86aa54ab6de42ca7694899b97064bde7 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:36:44 +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) (cherry picked from commit 0415f0554b72b93a1986292d28f679594f6ce6a6) --- 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 0a6928e3d4eb..eeb4a2c1cc78 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4601,8 +4601,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) {