From nobody Thu Sep 4 20:03:23 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 4cHr581gKgz66gX7; Thu, 04 Sep 2025 20:03:24 +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 4cHr5812vQz3ZYb; Thu, 04 Sep 2025 20:03:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016204; 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=JIDk/LjWMlCCtYrRvZVVsFcR/xOZXqx1n3YhmmU241A=; b=Ki42xxQWkSOZpdE9uNuZOR5MRii+xtGZuBTtGqD2Pf88vw1et6AA5Ri/6OCoFQmTSiujwS vXONdLeegRZhltFL7iMyWbGU1p6gL9wLNlQdZsIJzoHsZkVPjBOJSIG2UGcAEmSgCSSvl9 mJ+3AKHk8hnbzar6COeLYhjG93P+gI4wHYF0gVEW5O/36iZSou4T2jYVZeuCGV5XIUECeC 3oRrFZ9JlJpqsVy8Ie2X/ez/Su4rh4KfvVxyrDSKuvf3r9J5s9Ra4vKaBlpouKRzlyHavI rl1kmRkln85T61YnOi5W1MPTHXbGKZpEodqcg0ZH0aEFuJFPzeJFZM044YXb6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757016204; 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=JIDk/LjWMlCCtYrRvZVVsFcR/xOZXqx1n3YhmmU241A=; b=qvu3KSmiDdwqDiT5H42MRvunZiXXqm6+ybpX2EBTe6vulY3Fp1hc9lOvVzeAnIu8YOdL/Z GLoO2+oBJU3/Jcier1qCrY2KMoIEmhfB3wCpAA3MPzMNqMElGgz4GRHXc+U0FLBnbFbV9m WtbH/IqtRGN9FGnL2jL+rX45I5rT+p+JPvuZ6CK86O3cFUbx7kyEu4OKKrt15O5Hw/jCO1 BqBJBNuDnvo3BKv9AcxT0j8YoJhEt8ohNKAvR1XGltDYRRaaQD3zttsITHYor7QiHG49Wl Lm7nlbXKhWR4DtOiKdB+qQfKI/lNUE9RYWyWz1cQP+Xx/l5zpH63ebRUc7iGMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757016204; a=rsa-sha256; cv=none; b=YEQhxLf2Bj5/Yi1s7FAxeJE7mYo5PmHxMcfoumtaGIQ8efTFJiddOdd+yRF5+9bVpUSuIt L9ZuXONECngtqb2lxPCJo3a4cVdHHeDWVZu+X5/atvpiBSUOGE1IxjhT9VU9HFOky+LeuK yHI+T6TQ2UsTMr6+Na4rBI3cnTNfl3SqRf5w/HEPYZuUjzHzMFUwLSPJbemim4otQAeba5 M1F9qHS21fPVBOPQ0adkM1HytxXwCaUbK5vQZJwROaOb0kH5CjIMQ/Uc8Dfh/+lvmSBJ04 qIb2wlxKOFrabgbI4EqYkR+762XFffov6sjqr/sEk9rHRgRTxvTui9utWZecQw== 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 4cHr580KTsz2dV; Thu, 04 Sep 2025 20:03:24 +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 584K3NnW046388; Thu, 4 Sep 2025 20:03:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584K3Nf3046385; Thu, 4 Sep 2025 20:03:23 GMT (envelope-from git) Date: Thu, 4 Sep 2025 20:03:23 GMT Message-Id: <202509042003.584K3Nf3046385@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: c53a68283300 - stable/14 - tcp: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c53a6828330043d9ca2e2b56315cee4accd11f30 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c53a6828330043d9ca2e2b56315cee4accd11f30 commit c53a6828330043d9ca2e2b56315cee4accd11f30 Author: Michael Tuexen AuthorDate: 2025-06-13 20:53:42 +0000 Commit: Michael Tuexen CommitDate: 2025-09-04 20:03:01 +0000 tcp: fix local blackholing The sysctl-variable net.inet.tcp.blackhole_local should affect TCP segments 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/D50828 (cherry picked from commit de8fb1b3835758998a53d772deeebcdb71bbb823) --- sys/netinet/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index b4c77c303df7..fb0c110d460d 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1411,7 +1411,7 @@ dropwithreset: ((V_blackhole == 1 && (thflags & TH_SYN)) || V_blackhole > 1))) && (V_blackhole_local || ( #ifdef INET6 - isipv6 ? !in6_localaddr(&ip6->ip6_src) : + isipv6 ? !in6_localip(&ip6->ip6_src) : #endif #ifdef INET !in_localip(ip->ip_src)