From nobody Wed Apr 9 19:30:42 2025 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 4ZXtMk484vz5sGQm; Wed, 09 Apr 2025 19: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZXtMk3bxCz45Mn; Wed, 09 Apr 2025 19:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744227042; 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=/zQ0tJl8CnGMMSrr1/Yk3JvKCeZq3TOcePaBT8XFsHI=; b=YL4V6qHnnGDiK542ApR2g9dEGwXv0Rng5qnEeKos1TxbPGdEll1UhAAKwJp+3ZGYQCPIHm 9rWf1MpmBp1SKhXrFMew6Dr5RUlQv624u5i17KcPghAsBkSVBQrTJuxO/k6zAwG8VbBzgk pyIG3/Tbeo+0uz5LyKXHwOa6V2M2fCESmtEJxwcbAnqMdhg4o8Jd/bqpjoo4JPIlXNAHRD 9BU3BNP2HnWWEQDizk+t4Ts3msY9mKE7Ze9sZKIgVWlhp949bag1DEnphRlUliztjFl2ra /NfRcOnJH8YclRLEujHXT0RszSSXpjj+Nee0uBpw+UQhFUFLwKvRaBwbEACcCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744227042; a=rsa-sha256; cv=none; b=ezfbXi6XwTMF7hc0nxpyphpESSDBNkB8ECVobVwob2BxvYOisq4B2CeJmKPHAJKTOaQuAK uJWBLBIOBh9zzf+UHf1g6K2urb1tQl9Y+nIDbq3G2bvdn9dvwdaYJj8RVRDmJLP4xTICaX c7BNmHCHP+qbZlITnhOTdv9Pb3BRUxoawcFX8O7cLZ7THaxYDI+aFIp575bqwCLzABBEGk hXHGYV4OE5P6aN0pVSE+oVkmGsdVuq8uoxmYfhqUbMl0JTw/Q6dgaxV35B1Gb/pL+orCGZ W9N9mXnTQaaWLKe8rMFM/QrIxjTAt740l/AjagxF1Sshy3zx7YDyNU/Ci2w1Rg== 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=1744227042; 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=/zQ0tJl8CnGMMSrr1/Yk3JvKCeZq3TOcePaBT8XFsHI=; b=LX4DixkNmwH5Cul2obb0p1Rs0c06ZM6CrDN1fNLjz4ZiFGtFwGPrIMEfazdY8rQHj6VwyW ooejN+B6rCDVXST87jVuEswvUXHf4A0Cj+PtfqoGzcj2Wa1wtNou/DB9bzt5Q5sgPkHVh7 uGkaOzT9Vgu+Lzdax/FVp86B3e7/DIoYMsE5/rnX0nwA6OpXmj/q4RF5c8FvKZ6HOANNaM n8My0XjGh3fb/uCwSsDs9Va8eJZXqgSApIEDjwTOy3S1HtwhEaE3wVAESW/w7B41gwK5iD PmCvzXlu/sx41uH2nUtJxzbD8u+7bqg24/b9aXLeHDRO3hA4dAoa/MU+LKvgOQ== 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 4ZXtMk34WzzVlL; Wed, 09 Apr 2025 19:30:42 +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 539JUgGK080003; Wed, 9 Apr 2025 19:30:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 539JUgES079998; Wed, 9 Apr 2025 19:30:42 GMT (envelope-from git) Date: Wed, 9 Apr 2025 19:30:42 GMT Message-Id: <202504091930.539JUgES079998@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: d1f4b9ffabbc - main - pf: emit ICMPv6 packet too big for route-to 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: d1f4b9ffabbcc2c29ab83435bd73b0670818bbd1 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d1f4b9ffabbcc2c29ab83435bd73b0670818bbd1 commit d1f4b9ffabbcc2c29ab83435bd73b0670818bbd1 Author: Kristof Provost AuthorDate: 2025-04-09 12:38:39 +0000 Commit: Kristof Provost CommitDate: 2025-04-09 19:30:17 +0000 pf: emit ICMPv6 packet too big for route-to Based on OpenBSD's ae08e5b41d6 (by sashan ). We already implemented most of this (i.e. the refragmenting) but we did not send the packet-too-big error. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_norm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 382f876234da..2dc4553bd4f4 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -43,6 +43,7 @@ #include #include +#include #include #include #include @@ -1051,7 +1052,13 @@ pf_refragment6(struct ifnet *ifp, struct mbuf **m0, struct m_tag *mtag, dst.sin6_len = sizeof(dst); dst.sin6_addr = hdr->ip6_dst; - nd6_output_ifp(rt, rt, m, &dst, NULL); + if (m->m_pkthdr.len <= if_getmtu(ifp)) { + nd6_output_ifp(rt, rt, m, &dst, NULL); + } else { + in6_ifstat_inc(ifp, ifs6_in_toobig); + icmp6_error(m, ICMP6_PACKET_TOO_BIG, 0, + if_getmtu(ifp)); + } } else if (forward) { MPASS(m->m_pkthdr.rcvif != NULL); ip6_forward(m, 0);