From nobody Tue Dec 5 18:27:42 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 4Sl8Cf2ldwz53JMW; Tue, 5 Dec 2023 18:27:42 +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 4Sl8Cf1tPRz3ZSm; Tue, 5 Dec 2023 18:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701800862; 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=uEHmnYtTGLcjMZBAF0Wsb8U5ysSdtbqpJi0QUnh1VJg=; b=nuU9zQdUKfa98wEX8maXDvXSQTGjTEXNudwKGQQFcBuUeJB09BCIaQSTzMJ/TSlXsEBFuG TdZcS/epdXGxoBtZvFMg+im8+zuGyC1aGNaGKd8+OS4VB7ovmdzuB/OFYVAgf/Nyc5wxz4 jccyzAokRRSPUHAEG2PB+GlfM+MuWdEi/4kt97p3xSnQ6X5aQG06Z9elckqA8Vk1hy8muz NVyMA2EsxuVnXUX421mxWznK4Klvjvpr0BxMnKbUQhU031Z2eJxVlmvLJRZ1pNoyxeHlXU 1ymmd7j9w+rjfINyRP5wtXg2RjuvGU+LqJyGGPpYaLzuEskLG89NR+CaRnXwpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701800862; a=rsa-sha256; cv=none; b=CB7G1M1Ycw5pKRp6LXoJh6z2K8Z1hyJ1A6R+vYUgfH2e0YtDTj3lUJXsdpmJR14fK4ZpeY l3oKBYU9QNYHPM8WzdkAkDAF/mSZJ84dLY9NZl7H4O3IIicPTw1SVr/QkrI+woTrcJBWuB oDJIkC16rEk1B+K6J27+8DW5SzJmItpAi0F5J4KAw/gpFIxNDO87vV7Yk7YMmhNhsJojZu 7tPFIfPSsk85P+zALCHSYz+brkqd6150s1r7dkSpFSV4cxA5KPj/jKUqSSJGk86AJtR0QW f0QY+L1BK4OkrsLswGUYrfYpe46a53gSv/H6T9jt8omk8uvt4cQC2W4LvuyPRQ== 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=1701800862; 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=uEHmnYtTGLcjMZBAF0Wsb8U5ysSdtbqpJi0QUnh1VJg=; b=mHVGH8+o03r57WMm/nrg1A7dAEE9tWBjDxAhHCbU5chOZA0IREplraLxnlBh78W/YKdJwG 3rFqmvMWPA5K6weY3D9YOQ24Y5fs+aCf/+s9MmZvIIzm6/owx0EuP1ub1cLQ99IF7/ZE7z mNVTs8Fixx/Ldy2ie+Af66oYwMPV5HEN6RCPuZaX9IgYzx2oHlJJaTw63LG5jy36h2EAkW P4DSBNmniSQZbDD2kBsPfF3OghNTFSzwERdTynl+7IIbmp6wI2cT0jsd+130W1N8Z2Nc0j 9JTnEsyvt04iqKhtJK8QIqTEtMFycpy+SFkThYXaNERvM8LSCcBLN0JpkqLNZQ== 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 4Sl8Cf0n9Nz5R2; Tue, 5 Dec 2023 18:27:42 +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 3B5IRgxq009586; Tue, 5 Dec 2023 18:27:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IRgUY009583; Tue, 5 Dec 2023 18:27:42 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:27:42 GMT Message-Id: <202312051827.3B5IRgUY009583@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: 0019b7058a7a - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 0019b7058a7acbea72da214cb393dd3c933e4748 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0019b7058a7acbea72da214cb393dd3c933e4748 commit 0019b7058a7acbea72da214cb393dd3c933e4748 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:26:28 +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 a47a44c0d69ce82f302b02da940538a99b47037f) --- 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 0973c829644a..eab79387e867 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5316,8 +5316,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) {