From nobody Mon Sep 16 13:05:20 2024 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 4X6lWh1zpZz5Vxv6; Mon, 16 Sep 2024 13:05:20 +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 4X6lWh1TGSz549C; Mon, 16 Sep 2024 13:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726491920; 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=EJoYKReHN65PAIJzfGw25WVC4PUzt0LZDLA2JSVyboo=; b=CQSC+zr6ohVdV8e/EJrOZZmWuy7aUAb5rnoqjEdIROOtb1wunQY0G3SWfGa8SGhDNvVe7D m6zvR06n98m2KqCHG62CTFF6lzJKcI9qN8FUgPMcccYMV/g0S1WTO3Xr1adw30cB4uHktc cVcvCkbwimSbZ87pZIzyUvAZ6e9TDPx7rzzL3Rrezntnm45d2AHeVCIVVWZVH/tvNchC2G W91NEwIR0Z05ox4fZN6lh917xWfBahF1EVCkgKQ2PfrJPhWC2LFtzkhyw6KTG3OCTu548q nUSWyqNZJMTTxi+DQC6iBSeZeeZeV6azh8eP9GRCdueMQxLDp0ZT1/K3RalaNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726491920; a=rsa-sha256; cv=none; b=oKLwk8plGdKJ5dko1dQ+PvPSqHAclvSpNzwYci68t1AH7WsSfm+Bkzz1WJGmu6YKSJMLJW UYYfOgF3kWWftt1P7UGvgSWqXPh06l7LPzQ6MB/NjbjH0nvqqzDNAnJ9hayhrV5OvkmxW4 ewF92ELkCU2ZzQ1zo3rNoOG07xU+74K8BP4RBxXB5JqbKGAXLXT7DEoSdFGovpulWDZJuX fiwRNZ3JlPqCm5sI/OkbAijqc37P6qg3Y9in/okybuaJo0kOiJ+iK8oYxeDtm30d4CRYih gGUSrMr6acdPmdu4BFmuRUAtgmbR55oF4sal1SI8ES61R03Xvu2UKJyWK0cRjQ== 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=1726491920; 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=EJoYKReHN65PAIJzfGw25WVC4PUzt0LZDLA2JSVyboo=; b=uKchX0GHljemtV7/gLrepLgF5PyuuqEj/JQhSNgMAzxtXgGGL415f/rnpEUZhpZ9bYfUtC U+cDk07nWyCZ7uw75e5auDeGQPSkgl+BMBEwX10ZUuQ25xA4aywk1729Lzk3gjxYYtOXt/ BwkFW7+b6dOe8Io9E0Boy4texm3X5r7rE6OweM4DU/9p44KP4DuXjFwTqZtBVUrHKhmvIT lBKC32JRhf4D6coIhh4A6VzTB+m333lLtNB6k3yTKuYpxmFmD7sGq1c7uR5Q/AZH1Ew9wj IsMH7o+SJpUB+63KZto2565yPLJuPy4Dg4H75IiBWDDQrqImhKmq2MEBKweCag== 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 4X6lWh14ZKzwVj; Mon, 16 Sep 2024 13:05:20 +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 48GD5KgH020597; Mon, 16 Sep 2024 13:05:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48GD5KIe020594; Mon, 16 Sep 2024 13:05:20 GMT (envelope-from git) Date: Mon, 16 Sep 2024 13:05:20 GMT Message-Id: <202409161305.48GD5KIe020594@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: 2ca286d0d260 - main - pf: always drop ICMPv6 in IPv4 datagrams 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: 2ca286d0d2609bbb021f6eaecc6a6b864705719e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2ca286d0d2609bbb021f6eaecc6a6b864705719e commit 2ca286d0d2609bbb021f6eaecc6a6b864705719e Author: Kristof Provost AuthorDate: 2024-08-28 13:17:57 +0000 Commit: Kristof Provost CommitDate: 2024-09-16 11:46:09 +0000 pf: always drop ICMPv6 in IPv4 datagrams Not only when compiled with INET6. Suggested by Max Laier. ok henning@ Reviewed by: zlei Obtained from: OpenBSD, jsing , 0ba1e6e32b9 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46575 --- sys/netpfil/pf/pf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 2066cfbeccff..cb404b93946e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8828,14 +8828,12 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, break; } -#ifdef INET6 case IPPROTO_ICMPV6: { action = PF_DROP; DPFPRINTF(PF_DEBUG_MISC, ("pf: dropping IPv4 packet with ICMPv6 payload\n")); goto done; } -#endif default: action = pf_test_state_other(&s, kif, m, &pd);