From nobody Thu Sep 04 20:04:04 2025 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 4cHr5w55lMz66gVw; Thu, 04 Sep 2025 20:04:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHr5w3hB6z3bWJ; Thu, 04 Sep 2025 20:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016244; 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=gE2tNlVLqteB/Kf3g7qKrYjw5x2T95Imf6Aof64jZwU=; b=OZ1Z72NEpQsGxxSRm+RwW0k6fDoUWMsjBDflffU7/s6sX5lgI05enPV4PeloDmlK5XYLRk ebY8RTpnWuA53UO2wjmkjoTCcjlT5gyNfwmcmzylSVtdsWhzbLvAKL7bJJLtgZ9F6wEKcq ej5P6kdThs8JyT5YajTOoVtJhMoWZy/zeCu7rg5vY9u4TGU08Xh0oKj5b/+2HjVLYPbcXe N1wDONAlQG2yuf+GN5Ie/KyU1jC1Oy5S5N7kuL2HREDTYDLKY+zwoB8Pz4Q5o0qjD7KO2H keaA6+N7p+y4PFGO/t26S0hClM2M2cwtYS3wM6ABggImkdA3UmNeLAyC1IO0CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016244; 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=gE2tNlVLqteB/Kf3g7qKrYjw5x2T95Imf6Aof64jZwU=; b=UqYP1JjIoISb+WsIZvZM8cAs2naUG50ymbRYOVH0S+Bg6SnSQcz06qwpq3s5bKehwQFo0O 2djrGbbTUxWqpCAsEFuN+G/L83+rxjV1zbPirQeJsbBL+E6CxQJOz4vtpQszlkW3GgJYB5 S3lGtOqQYwGrUpy9J0/MHh40HYGQD000CQ/NS03gS5+ECHGMg3gIu+1dKNPxjc+xeeh+QL mv0DXvGoOSLlP7uNl2vdLUoSY2Nim8A2CR4k0Oa5liCaEKwkK91Ko1L0w3h1UKboOFM75e 7TaFfqkldAjj9uXOW7nM3+SNzQx0PcsDUlf5WT79nTnTe3omDeOySSSUBiXosA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757016244; a=rsa-sha256; cv=none; b=O+SBRq3zlpRg5QdUVCD/8OTyUsq4HiehbBuw/+myoQxWhaLorJgAWpeogizMNox6+sWdEc 3WgVmCs94B25ix/Go1UgqtbJ7FyTAdiSD3XPYOaCEKh2u+IddhGcDH8SHFKYJGT1X6PIqt 0+NUWc3GX4oBXrqihA0ukyQds46Aool2Cu9kaXBKAzy/T7yB2Nud7SG+0vcZ9WhvxfB8TA u1h+Xh20QNBa/b7XujLuuQZclo5WJXgZTsQr6Y6xRVuqTeuV/4JiVfbXYtl8H2gRFn7Mqm qlbehEu/DdcT1Y7WEV9CpLJcjR7uyazNwJRUhfehQffnAICegc3ioQOhOk9+fg== 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 4cHr5w326Xz2T6; Thu, 04 Sep 2025 20:04:04 +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 584K444G046719; Thu, 4 Sep 2025 20:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584K44s2046716; Thu, 4 Sep 2025 20:04:04 GMT (envelope-from git) Date: Thu, 4 Sep 2025 20:04:04 GMT Message-Id: <202509042004.584K44s2046716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 5bfaf4a161da - stable/14 - udp: fix local blackholing 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5bfaf4a161da1fe8bc296f1651f350c1d14518dd Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5bfaf4a161da1fe8bc296f1651f350c1d14518dd commit 5bfaf4a161da1fe8bc296f1651f350c1d14518dd Author: Michael Tuexen AuthorDate: 2025-06-13 20:57:16 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 20:03:42 +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 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50829 (cherry picked from commit 16587f60a69820f1a319644da4ec1a40efbcbdf0) --- 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 066cf79c3a07..736f2da5c0ad 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -514,7 +514,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;