From nobody Thu May 08 13:10:40 2025 X-Original-To: dev-commits-src-main@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 4ZtXYr6q8Tz5wJSh; Thu, 08 May 2025 13:10:40 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtXYr3CX5z3Lcc; Thu, 08 May 2025 13:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746709840; 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=prSPnDQ060H8V/vt9lTu1H+IHLexD5VhAwr9KN0tauI=; b=c/lAreHZtxRb62jzqOcJTB8kE00ELwdO1oz95wx/kqabj5LsnRWGrV10lNecfDeA2Hi9dq nRw+nUJ0Q4Ay42OwlosAbF29zHDtuGAeFJZ6UDRkJl8pNCIpUut+SfiCawl7kFmxxAOkif Om2Ipc2+7kNbPOJ2wklfR8KbjI3mZPvBQC8IBFtuMLJsgzDqcIN0LCI6yVT1/BRc1HelsQ yIFgALWSX2ms/YWxlQcUFmpCng+BieQMFCDDbGB8i5Vgamt8XRAr3wvg1Y6/NH8JGyaaXH 5ltEIfVVKSmZsuYfoFzTk1hcPxchOKh7j53kwkxyTI3ldvHeHh+/bXBXprkSPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746709840; 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=prSPnDQ060H8V/vt9lTu1H+IHLexD5VhAwr9KN0tauI=; b=xyBo52B1dVSp2K8zg4iEQ5kco0BcUOgsxLW+nEsJK87hAPyeMTt4MseTpAXoqYLNLFpaS7 AhJ9i4Y2Ut1rw3s8B36AsZ9snT6UuruSmcns5nceNNrJRMPnHosgXH2Rzkm1iXNsDNM3F/ Ihie15Rqjxl3Vba77jRIsIbMuN4ZGrw6I5VnxGhwfmi3YgNULr2YfxxsY0JY0u4Gx1IRA7 HtOVVOQGf8V/uTBYrqFlsg/sY5FgXlxwtfo+YQ6u5spAQM3q51rL4XeVCztxwh71sB+9xC VcfnOgFXdEmLcPGWzUcXI5BoU3+E7qrfIiGS0I/IxjG4Sij5NMi/jFWyckCDLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746709840; a=rsa-sha256; cv=none; b=ZIwwPMKzjUeNepYI7IKaIhRaAMRowrYjNUOOxlBoZAbxxcUnGq/NVLxfhZAHxbRwCf4H7A yFryAO6CKSFkgLh6ePkEQsLfx5NsBO/EUAEbkaLbFSN/xYcuJeoqMEMVUcdVcDiPgu+4rL 96T5LD2GmZcgBtztfdBDZ/74zjx0oszwxFI6sfncqXT2510pUBiyyl8laTJMfIyWqt0xjD dP2oyXCorh0rAbfobvUmggEMunvGwn6fnGCSMh1erOsZEH01qiBNDoKn4Lk6XE1OKr8nMe xuzlqJjniclRQUAdDGEm3JZm48a787emNIC04EKKddJJcP00aqmZjJazMAumow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZtXYr2mX2z19C; Thu, 08 May 2025 13:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548DAeJR047064; Thu, 8 May 2025 13:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548DAe8U047061; Thu, 8 May 2025 13:10:40 GMT (envelope-from git) Date: Thu, 8 May 2025 13:10:40 GMT Message-Id: <202505081310.548DAe8U047061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 3bb82353b528 - main - pf: reject hop-by-hop if it's not the first extension header List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bb82353b528e7e2a0815648d5be36c610b001f9 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3bb82353b528e7e2a0815648d5be36c610b001f9 commit 3bb82353b528e7e2a0815648d5be36c610b001f9 Author: Kristof Provost AuthorDate: 2025-05-06 09:18:27 +0000 Commit: Kristof Provost CommitDate: 2025-05-08 13:10:24 +0000 pf: reject hop-by-hop if it's not the first extension header The pf fragment reassembly code accepted IPv6 hop-by-hop headers after fragment headers. Add an extra check that the hop-by-hop header is always the first extension header after the IPv6 header. Found by Antonios Atlasis; OK sthen@ mpi@ Obtained from: OpenBSD, bluhm , 17ea4b2bcd Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 2515c85c3eb7..2f69f36e2db3 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -9774,13 +9774,14 @@ pf_walk_header6(struct pf_pdesc *pd, struct ip6_hdr *h, u_short *reason) struct ip6_ext ext; struct ip6_rthdr rthdr; uint32_t end; - int fraghdr_cnt = 0, rthdr_cnt = 0; + int hdr_cnt = 0, fraghdr_cnt = 0, rthdr_cnt = 0; pd->off += sizeof(struct ip6_hdr); end = pd->off + ntohs(h->ip6_plen); pd->fragoff = pd->extoff = pd->jumbolen = 0; pd->proto = h->ip6_nxt; for (;;) { + hdr_cnt++; switch (pd->proto) { case IPPROTO_FRAGMENT: if (fraghdr_cnt++) { @@ -9833,8 +9834,15 @@ pf_walk_header6(struct pf_pdesc *pd, struct ip6_hdr *h, u_short *reason) return (PF_DROP); } /* FALLTHROUGH */ - case IPPROTO_AH: case IPPROTO_HOPOPTS: + /* RFC2460 4.1: Hop-by-Hop only after IPv6 header */ + if (pd->proto == IPPROTO_HOPOPTS && hdr_cnt > 1) { + DPFPRINTF(PF_DEBUG_MISC, ("IPv6 hopopts not first")); + REASON_SET(reason, PFRES_IPOPTIONS); + return (PF_DROP); + } + /* FALLTHROUGH */ + case IPPROTO_AH: case IPPROTO_DSTOPTS: if (!pf_pull_hdr(pd->m, pd->off, &ext, sizeof(ext), NULL, reason, AF_INET6)) {