From nobody Fri Jun 13 21:00:06 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 4bJsGt2cQGz516dM; Fri, 13 Jun 2025 21:00:06 +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 4bJsGt1fCYz3HFY; Fri, 13 Jun 2025 21:00:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749848406; 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=1dGa/NuqcFSvL0Hoe3qheexVVNOydn+4Rgs1uTqRc/E=; b=pfgzXvBPSFI81WDharXMsZxoMZ6GHg1a1Aon0ZobkfTOKN0OKiPClLKf2K0WSmZ1IrZ8QR FMVR/BHn4YrM3/s7D278p508P/6fUbPZc4XZCJuNLFtw8PHZJJlhTfIvvQZRznMOSQ2FpC jW+JB2FH7iGZXThfe4ZL695chASRJTcHHY5mUwbQyDPvMUcmi4Zf2nINTAS4EEgPtl1BzE r8n2WeFsqYRJj4DaN+9x2w53CCxStkXhznKc94UxxECfjX8IzgZ/2umUGDmck9ZtMjJdL7 adYNN/2Q05A/788s/h3wuCiE8NA3cgSwJjI2gjv5R4OrzYNq2iUUfMWwIS/tEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749848406; 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=1dGa/NuqcFSvL0Hoe3qheexVVNOydn+4Rgs1uTqRc/E=; b=SD8yk2y15DIqKtEcQMRwlznb8HbAZ2idJL+zfwTVggd88UOQgVGAZV+b/BrK2GA9ENnd3P Ub+D8QOqVi6RR3xGcdkcG/RBbeKjsywQsweO81U3USvrOmjLVB+MRLjMfSdV1EjxK5CPwO ApSSOE9zdY3ULMRG8o4Lr2jVUcUz1X3vf8OfA97NAlZn4PQSviSI2Dt6B9Zbx9UGbBZIz0 e4zC0SppWJlZRzmCmLHof+Htd0ZTHZdtzSd6vWuzDwEEit8hRJOndV60w07CfYxADUfZEB /NWp9nGVV0ZjoN9ni/JpFv7JhtYhMLtDKqjphLz5/UTdhLec91PMLnT9UOBUtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749848406; a=rsa-sha256; cv=none; b=nntJRJTmltH1ipPZorysQjlsJ0RvXMpA+8QxCnsyi217UnfIxdKKfDiXeu8kaqhNkaWVAL 0scxT8kZNiC4HYSrCOXG2zvdLFLfvBFuhKgOWrYnJtZq3HnyYsmB6NI2/ql220Wuhr16WC rPWaHlmDoe1zWhbTbYKfWHbvXbEOueYeuPH+4MKZBmQDfijm5ngHrY4MbWoWIjRdkIYOYx p4jgJoVBv8+ZHtcDg2sGbMDNdmy/guzfB+JJ1baha3Cp14W9NIooAn8tVNCo2ZZfehswYO /kGKMuuJn1u9EocQZYsWmQS+v1HdQMWA4IUOEkP8bNecw7GNFvJATjmWWaoWNA== 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 4bJsGt18hLz1CMt; Fri, 13 Jun 2025 21:00:06 +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 55DL06wi091655; Fri, 13 Jun 2025 21:00:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55DL06aC091651; Fri, 13 Jun 2025 21:00:06 GMT (envelope-from git) Date: Fri, 13 Jun 2025 21:00:06 GMT Message-Id: <202506132100.55DL06aC091651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 16587f60a698 - main - udp: fix local blackholing 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16587f60a69820f1a319644da4ec1a40efbcbdf0 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=16587f60a69820f1a319644da4ec1a40efbcbdf0 commit 16587f60a69820f1a319644da4ec1a40efbcbdf0 Author: Michael Tuexen AuthorDate: 2025-06-13 20:57:16 +0000 Commit: Michael Tuexen CommitDate: 2025-06-13 20:59:50 +0000 udp: fix local blackholing The sysctl-variable net.inet.udp.blackhole_local should affect UDP packets from an IPv6 address of the local host, not of a host on the local area network. Thanks to cc@ for pointing me to the issue. Reviewed by: cc MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50829 --- sys/netinet6/udp6_usrreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index c8f91fff2b76..304effa26e01 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -517,7 +517,7 @@ skip_checksum: goto badunlocked; } if (V_udp_blackhole && (V_udp_blackhole_local || - !in6_localaddr(&ip6->ip6_src))) + !in6_localip(&ip6->ip6_src))) goto badunlocked; icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0); *mp = NULL;