From nobody Tue Dec 05 18:27:10 2023 X-Original-To: dev-commits-src-all@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 4Sl8C30kVcz53JV9; Tue, 5 Dec 2023 18:27:11 +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 4Sl8C30DpPz3YRk; Tue, 5 Dec 2023 18:27:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800831; 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=ptipanaAwOrC0RySEtGyiK9hhh4eRuOATM+i37tmYhU=; b=u5RhPDByMjzj4LhLkY98UfwYhkJs6tviff04VOK19ZInaUhXBFTUSMz46xezkGzZHc8lPX d1OuJu8tUctjUAiu5SQQt4dMwl/EFfPBrqKCic1nieIAmU3F8s2PmhJfo4m1SvFHRhvxAX IZKGTEVm3TGatTjWqVVQphsfh2mka8+NI9LYn5lsFzzBOtBs/CMxoDuauckev+BovEE7ch Jpjy08v4pEWzLuUqzu9XJsyyAoe1bNBhkMqznpp8hCCh7JN1lOXZZeJ5qQVnTLCqSZ3Kma 7C0Va2U+3yoyI6Fxf7QxyMUUaP07qoz3niPEYNO8RhqIhxnbzBHqD1J6bv8+LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800831; a=rsa-sha256; cv=none; b=FH/xeLYcNB8ePHxaDkYNwSbmnxJZM4gC8p8vjhYXZ4f0NkkYTteRYjcmzRC8eBlE5woWBF 2H8UC68DMH+hQlCrFACj/DmucF4rx6ttz9DGSi06g9V0ddvmCw4gyGKOQurfHe8pbKvd2+ 6FhdDuRKcWhX9oFrHRaCOo1qkaSyNM4PDrznQYl6XvFYR0NgO+GOO0PThaD3GdpuPGwfYs YSYer2i8NWZW/WVthGZ6H2D7R2SyN8HPj9RSlg2I9RLhrhxf6mjTYMVgEo54TMyh9fi7/5 Lfwt7l0qAXWi5wPYU9wBZ7AegGnAkLSHUkevzyf6rUUaFnOdKiDBMVSk51Gt/w== 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=1701800831; 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=ptipanaAwOrC0RySEtGyiK9hhh4eRuOATM+i37tmYhU=; b=vGXaGQFECNALwFEE99tWwhlzOueVC+dk5uEGtPId9wFwO7Hn10Jq6sPzW6sK4Dz/jt/z0f wXBqgAqZ2zaX/tqhW0HFk4uxNsFXW0dubmBHpzJ1SYeDHkpUiZBk7TO0vjkm9GAx623rdq DeJj+DdPWzlqD8WbPW4gCzM3v1KIbUgw4M/DiU+/mcHDSXrzlVqKNmzvhd7pYXYTMHWSnk ZVv8JXKR2PSGBM0ELVOyibJdsTWMwz2zrrjX5x7U/5i+4OmGdhfJBNRT5w5TsZb805AuTu vpQOs/v9w0vAGPPtFv4xtVpBxQNgxyFFkRU1gUOR4JQrj7P1jL0f6N7OSxY+cg== 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 4Sl8C26NSNz5R1; Tue, 5 Dec 2023 18:27:10 +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 3B5IRAun008924; Tue, 5 Dec 2023 18:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRArV008921; Tue, 5 Dec 2023 18:27:10 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:10 GMT Message-Id: <202312051827.3B5IRArV008921@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: ee1d1e38fae6 - stable/13 - pf: remove incorrect fragmentation check List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: ee1d1e38fae65d045b113a7053651bbd7b780e1d Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ee1d1e38fae65d045b113a7053651bbd7b780e1d commit ee1d1e38fae65d045b113a7053651bbd7b780e1d Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:25:22 +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 c09f80d2f82b..e03fcbbe37a9 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4780,8 +4780,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) {