From nobody Fri Jun 13 20:56:08 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 4bJsBJ3s87z51663; Fri, 13 Jun 2025 20:56:08 +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 4bJsBJ24G3z3GSw; Fri, 13 Jun 2025 20:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749848168; 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=g30ych3VPRHVfa/BiOz4zCwkMfXe07TkHe8RN/PB5bs=; b=xOQM/+mu+WLPr7Iua0oImEn9GzuuCnSwXP/MmZjHHp8kE7zqYh5yz8tWOQ6+wN37lYxFMS x60wKXw+PrLLR+t7WDUFZObFJYXizwri5RJ4/T32nBv0eYV4lr3jg7uWS8RvChKA65W4Ex CLLsk9ycxYD/u6njfx7DPlFzA5Az1DUgnjUSUDVPDWdIFHJ4qg5xVZrybjG0zGRWLcZVpu 66HnhEcLu4xrOMX0HuFNUBP0m4n/kFVTww+rqkM2wBeaSbeUqcNzrCGq5Uzsl9OXV995ZE lo8tILPDQg9Hsp3a+y8fx/NrfGFSkm8CfQv1V6Gi9bYP22votfWlyTrprfIZfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749848168; 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=g30ych3VPRHVfa/BiOz4zCwkMfXe07TkHe8RN/PB5bs=; b=NHNSvmmn2vut8ZAGjHf1hh/Xpkq2xFRj3ee39hQcRllLstVxUJYPgAVM908Kz/yPlkV1AG QjT3mLmK4gD5zfTOadHsJVbRfZJEtR9UAu/JVchNDDryGwRUs11YIZ9P/z6Osh09Dc98y3 OaRIGWMtodxPQGF8lWo3WtMC0X599/nqnylrrIITFZ+F1w3S/I5rFxj6uX8075wpWVXF/c NpE7C6A5pj1MqBDXu+A9iZkuUBFKFf8yMsUcmfLJy+JutEWPc/MURmp2CF3anUXlUOKxxo sow4XuizzzjtYYS+sxvhlhpXFET3znI9vrk+kIA9EhKAptKJsrbUbaNHkcIMGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749848168; a=rsa-sha256; cv=none; b=rcoJCjcAyVbYEsrUgTgUzA6dbDq2CvIHzRn2mjPxi6I+aWxgoMh20kkzOtGs3tjlY2QGL8 ncLGKx5tS3JP8b7PJCmxX0pMbl9cgX+7vy2vXaP7Yiy218tX7tJ/GJtkY3aA9HKqfg0NDE FVaQR47w3W7amCzLqdMD193ObQ4Ew3r2RLtpHxwJyNnCVULiUwoCNYea8khfWyPiyXlYPB ZdG4QMr0B0puGhd80bAHPUDvA6oAjUmGQFWIlo+exOrjXqovS33LtBkCSiqPb6Y9ro0oJp rlfsRiRAjYrH3E36WIoCDz5kPKPDys6zFlg/xG5LdqrpBrWKrgbCbV2S/azmsg== 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 4bJsBJ1gx9z1CmL; Fri, 13 Jun 2025 20:56:08 +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 55DKu8r6086304; Fri, 13 Jun 2025 20:56:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55DKu8vg086301; Fri, 13 Jun 2025 20:56:08 GMT (envelope-from git) Date: Fri, 13 Jun 2025 20:56:08 GMT Message-Id: <202506132056.55DKu8vg086301@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: de8fb1b38357 - main - 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/main X-Git-Reftype: branch X-Git-Commit: de8fb1b3835758998a53d772deeebcdb71bbb823 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=de8fb1b3835758998a53d772deeebcdb71bbb823 commit de8fb1b3835758998a53d772deeebcdb71bbb823 Author: Michael Tuexen AuthorDate: 2025-06-13 20:53:42 +0000 Commit: Michael Tuexen CommitDate: 2025-06-13 20:53:42 +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 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D50828 --- 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 c00a102e8520..1c617b85ef89 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1385,7 +1385,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)