From nobody Tue Dec 5 18:34:02 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 4Sl8Ly2qZMz53Jbt; Tue, 5 Dec 2023 18:34:02 +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 4Sl8Ly2FVkz3dt6; Tue, 5 Dec 2023 18:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801242; 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=djOApggBRE/l9ozMCW63pWItVvjAFDeHKKrdAZK1sBY=; b=ZdcnN+V4//AjUv6bjuuK0TuKoXCKw9oj0ZsIyk3NnEIXcWDav3IEyAAc7rQncrQgDxLc+s +92yuSR5e2EjxrQThLB5k5idUNVP7GH/xqQqjts2pxuqjfJwhqJ5ZPB/TkK9te/8eD3ghG IxpWMovV/wafUbESogJliHHY27wLKxLcbTWRer/77yHv3/NgutYuevpR22sVK3J8kdgaVI TYv0mVmhZNYhlOl0XC84FulX/8MnTyLef89RAuiwdB72DjIDndHC1HCJThHqffRR2s7TiH c+fbiDRPYB4L3hSIN8OW/BRexog1P64FRnqPdm60rI+xl/YO5RHrUqRBZVlfVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801242; a=rsa-sha256; cv=none; b=IxySFXAfDtN/mlDSkeui+X0XOMc6kgp56WvmwTpfVuKUquFJeiocV/VmuOIXp1pmk/dVEz zQHVPp7fZjuZHzu/yzKS2FPp0r6k6s65QT1AZekm90h1zDXf9eN1JcJq3l53XBB7EtcqYb CY/VN8QqdHfvmsb5nEMrpOcVqSAhtPQme5TyrkDQxlePsPF3HZB535i9BavtfZdoep6H95 KWehqS4ifrCD3S3vyfkUYfsIz+i1xZsMYEW/rXSMzOzCF5+TB2F7ZU8zdGvZdTg8iK9ahq EMFbsTmgdfDZvSGXHxrwWlxK8KzGfpcH6bh050rp1PCKevMKGNHnNBPQkC6BYA== 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=1701801242; 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=djOApggBRE/l9ozMCW63pWItVvjAFDeHKKrdAZK1sBY=; b=ytRn7WcsBLS1HlIzwPKMffvVGM8+Cvj0IWoX4iqANP/LhkXmPwEph14OoVbRT93rA7R6gw FXGq1HOEcaCTwoOZ3FFPWjx0nFJNxZArXFpvdMwRqetAz41Z4xjFxO3RbEQB1TkbLWG8AD k07gGpWCfcNx6TQ/isLVVKIZ9YYoQf0Y+TMTihcMdfUsX3UiaAno3Mb62ndaCI/IpqXlkn 2ZLQc6sxTfDKciRcho1QMrCm+UsYBwRSux95jnFc63W8IIDHBSHZa+K+h0ivijx2FfqaDb VdNK2nWpOw75shDVxedqolyIxQ5oH8RmMze3muzUMy8Q9jpV0L27wZ8FKnYRLg== 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 4Sl8Ly1JMLz5XL; Tue, 5 Dec 2023 18:34:02 +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 3B5IY2sh026080; Tue, 5 Dec 2023 18:34:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IY2h2026077; Tue, 5 Dec 2023 18:34:02 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:34:02 GMT Message-Id: <202312051834.3B5IY2h2026077@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: 1f8724dd18b0 - releng/12.3 - 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/12.3 X-Git-Reftype: branch X-Git-Commit: 1f8724dd18b0d57ccc74086040411bb1f0059be0 Auto-Submitted: auto-generated The branch releng/12.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f8724dd18b0d57ccc74086040411bb1f0059be0 commit 1f8724dd18b0d57ccc74086040411bb1f0059be0 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:31:14 +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 dd4c49959a60..cd3403b1bd22 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4477,8 +4477,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) {