From nobody Tue Dec 05 18:30:41 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 4Sl8H61MsJz53JkP; Tue, 5 Dec 2023 18:30: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 4Sl8H54KS8z3dj3; Tue, 5 Dec 2023 18:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801041; 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=xF4dOphHBfITMG7bAtvmYjxx1Rbs7j6FEV67JP1VZKc=; b=j3n/t+OPMeGa0HfERtMja+iP1D3WH0q5BnIHb+Jsm88ZRvCO3Lq+2cHBi1DPs+K885YBh/ lwnuIyhn+zFQOdj+TVLtlqE2RblDYSQZkl92znhkcP9sBd1rg3V2VCLIrlmGmGxWpZ6j1N guRy6LRwnh1sXkpR09QR0RbC0YoMUhP4T2qF6g6aE8NCtGQwGYsQs2GPKE8f/E3UTjskaj 0t2H19ECQqQnZVQRLv4yKLZ1k2yqdc3r7sGdiyKzYraDdzxlP/fbPS9rgaUSstq51CujOy +/znjr2QX9fIubCzMcov5vUREccag7Wcf0Jn/VvTgXaqVvsdBaNkDEhuCjiCNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801041; a=rsa-sha256; cv=none; b=e53Q5fFjkXirA8VPT/glhG62mFedI08Ymcf9kfYCPhOt/12K2Kx6UdsTiMIaowMyojkuIG 85VkmB3LZQTRutXydyRfTpPHyn586uu7eaxhMEM6LbYluJAbIrQKxat+f0VBAvrb+8TY6k KGq4f82fYZ+M2lEaan4uavQdXXWErhgYDIQa6dFfX4SMl05Gv8noe0bbeNtIfIJL9DDy2G V6Xd/f7gyDbR/9nJVBXf+fZoWgXIBTBpMn6lcTIGb956MrUDrd+gECK/5lQp0/Us7btKNZ dOGhRvMKllrtlxCdeITKxlR0KPZTQaAhadw1aurAA+XPNzUZMrWSvBsFibUHqQ== 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=1701801041; 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=xF4dOphHBfITMG7bAtvmYjxx1Rbs7j6FEV67JP1VZKc=; b=RA0lTfiOagLhlHTFbPyN7hQAd8mcSZFv2+OiibiqhADWAqaR+b2h3oj+/f5iCboCa7oeCe 4x6DRRWvb//gu0Yogb9fzBV+NXgJa/TYxsfTDkKfsHCkODxz8gZAuO19uN7X5yP4nyQuGp i4BoaAvaPhMIhZcO6L+sT8ywmGB0uP/c3hLq8DnWjW70mP2uMT1y2z3ONOaRKGYKipM76E Bm3n7YPuMK3OmQhWN7cwzrI0nmfzRT3uESjBYSL3F6uwDR9tGrTK8ANIl3cMj/A9031bL+ kAbLgk0QeM/XOlZ0i3wZfZUFvHQwqafTUEvyFmPiogRojgJfpCrT5/i/YHgcig== 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 4Sl8H52jHHz5RC; Tue, 5 Dec 2023 18:30:41 +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 3B5IUfeS019077; Tue, 5 Dec 2023 18:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IUfk5019074; Tue, 5 Dec 2023 18:30:41 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:30:41 GMT Message-Id: <202312051830.3B5IUfk5019074@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: 0415f0554b72 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 0415f0554b72b93a1986292d28f679594f6ce6a6 Auto-Submitted: auto-generated The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0415f0554b72b93a1986292d28f679594f6ce6a6 commit 0415f0554b72b93a1986292d28f679594f6ce6a6 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:25:58 +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 fbc6c9640f43..b9fb9ce7b1e4 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) {