From nobody Tue Dec 05 18:30:11 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 4Sl8GW6sHlz53Jgs; Tue, 5 Dec 2023 18:30: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 4Sl8GW6Ng3z3d0k; Tue, 5 Dec 2023 18:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701801011; 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=aK4oRH7SpZ8cbrxdhSQ7EN4CqfYmTUyEPWwkwgtWdGk=; b=DWgRsaezd0FjZ84+jehEGXUsnNSf11tD1xxP+g3FSUR+Jqji1HxwYsPswtJLdMnu1pdVXv 5CZUeqbuRyQjIZEnz3QL1qbsIJDI7jeWNEpoSobYK61D+r7NOBqJOwP1YPed6TMK4sNLgK Im7siNFqy1txldlEJoVpizYDBgNvkqw5JeTkYV0D0dI6kfOLf6f+UCyYUARM+km7ihfH1g n4zFKNA1guUEs+4aOsJxILZ73ujyFJQ/QOQmV/RhPAYl2IGYKy5I8FYj7piZrQ/QWQFU/f dItlP04METSAAc3lAp3uYxBLcSwKury0xIHJq/JmrZDAmjNOqwIpsrwDoRO6XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701801011; a=rsa-sha256; cv=none; b=TgwhnPXbtKBpAsBFs60yLjhkKIRYYmUamo8bOwo/xXG1BTr5Lkr5mU2aDfgcB7U6TvCC+1 f9HIGojDLVzsMYDT3jngmnAnocB6JbU9pY4gFmmWfGvut3e5xucti5s0KoyW5+RcpOjUcH dkUJrjOXXi9cmp6QkClK2yfv7870a48tByHINeQSdxlvoCKJfLwePXTyNSuFtRp1dX3WTX YwuNlYz80rDfl7lljznB4AXkRNSOxOo76k/YhGVEJwEc0FbYNoWcWoS7osdkIr0kYfOTCK 2DwjDkVIa5fbhtwis6/kogzgg1E1ey7hn74No6ggjtakoVX+A3TuDabKnftecw== 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=1701801011; 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=aK4oRH7SpZ8cbrxdhSQ7EN4CqfYmTUyEPWwkwgtWdGk=; b=klAfVYOFrHsv7jDrshc6Bnpb7/i8UaA9o5ZBP9cR8kuDI0RpUmU+gBWCr42/SIsvB0u6PE nhZONzIzKbvG7lti3TB8w7qZBOrko5GAkL7W7Pg6WauPtPHTDpzfEzMmoNFqgJUtKmCspL 3aWOH7SW+XO2uJLAAtAkxBebUJBc8N3NOeAAHYj//BiKp9wKKRdikjKTf9eFhxY9eV0iOS u37SKEao/XggxWv2WCHPttAeGwiROaX7Y2svBOMzVvGoaQ2vcDKjiFOhRzio4rVdm8ZUpx o++xqLg4spzocYYisoiPI7ojiFJFvA/P9wXJCw+ztaY8x4ZH72+LZ5P5oCqDVg== 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 4Sl8GW5NDhz5BB; Tue, 5 Dec 2023 18:30:11 +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 3B5IUB6l015156; Tue, 5 Dec 2023 18:30:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5IUBn6015147; Tue, 5 Dec 2023 18:30:11 GMT (envelope-from git) Date: Tue, 5 Dec 2023 18:30:11 GMT Message-Id: <202312051830.3B5IUBn6015147@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: 45e256e24c97 - releng/13.2 - 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/13.2 X-Git-Reftype: branch X-Git-Commit: 45e256e24c976a55dc856907a57564cbc30cfb60 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=45e256e24c976a55dc856907a57564cbc30cfb60 commit 45e256e24c976a55dc856907a57564cbc30cfb60 Author: Kristof Provost AuthorDate: 2023-11-29 18:06:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-05 18:28:12 +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 ee1d1e38fae65d045b113a7053651bbd7b780e1d) --- 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 c9c0995cc4e7..a52e29bf3e58 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4563,8 +4563,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) {