From nobody Tue Nov 25 03:19:27 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 4dFnww23hgz6HMfx for ; Tue, 25 Nov 2025 03:19:28 +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 4dFnwv72zvz3Tng for ; Tue, 25 Nov 2025 03:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764040768; 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=2bU3eho0PiFpaFF9g7m5446YujN49RkgKi/XURMrGOI=; b=f87PY0vjqdYkB9LLOZCdUOnyP1tlnytvMPWH1WJpPLVNi7ksvbFV9ruxTIAYA2JlybW6WN RjsORZSsUmH6qHB7N/OKxU320cQRCxiorr/JoQ/ZlCvs69UhpB+eeCy/2UZDKmkUx7aAVC ZVI7+6dl/P32H6U5ZsTmTFhCr4Fy5NUASxHXrfYdbtJ5L5ffRen75hsN3znvbnvZl6BqY5 sz6wG3x3HmU8cGGv5xz3mxH0ADe3jQP0nzjrjhwDcgSYRGYcJrTMCbNMeH9l2qLJ2lKOP0 w4RzrOiGBoytWFdQaBwOBC3DHI2siTzwfm1VH8IIr+jHEt315jD8gdSdkEfiAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764040768; 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=2bU3eho0PiFpaFF9g7m5446YujN49RkgKi/XURMrGOI=; b=oDSqmcRJcEMqI93OzOp2HPFAMD5XdWOzE0U11MTqfzOvSIJCPemLppVzyPO9AVQZwYOvjg pqCORXtB+2y5nLXTUpXPotho6I6Eh4X7OTaNNaS+vr+4NANFE6lrSbWyssa65/jewkUcS/ K58N6zVQ1w9namLewTgGlXYiwOMTQ7nQNLOV0fh/usegaW7gbIsZPqCZ/QF/dbH4QZdzih w1pizNTasl86P1TE1FUWrZ2BP6XE7Td1scLhgt3kpeULMqfkJuEH9pR+5qpxsRWarVGYVx W1yscrkkSPsdVAQh/uMov+VvJLQuZ+OB7ki44ChIiIG9Hd4DS5txlKDn400vMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764040768; a=rsa-sha256; cv=none; b=Kh6UG+TjOGcNQWhmYYNIa06zjsTedrr1VI9kbS8TDicwJHHVQmDAUe099akvtlxpQo95TU 3aWkkY6s29u0vUy2BhNEVf9zdp8KGVtcEf4pCz7lKLQKER90CbQ5jqv6O/J8/IXq/6eBus 5HiGQmpGlScjnCPb5KP13RVuMJhFm3okMJPu2vItoKuvYf2/JOe1V5YqFZMTHNR+a6Zfz9 hYoHCAfTThDI4VjOsPo67sEmCtGsXykELGsn3ik+P/JRARH2f2cztkgSEE+oKfAxt2iQC+ 60nA7yi22Y29svBBAzhyRXTzf0Mo3NmvbusBXBCqpI29pUzBGGqQBydAnJdIWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dFnwv6c1CzkDf for ; Tue, 25 Nov 2025 03:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 330d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 03:19:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4004f9a70c10 - stable/15 - openssh: Don't attempt to connect to unsupported addresses 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4004f9a70c10b2e6b8e71595f731605484308e5c Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 03:19:27 +0000 Message-Id: <6925203f.330d2.539256d0@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4004f9a70c10b2e6b8e71595f731605484308e5c commit 4004f9a70c10b2e6b8e71595f731605484308e5c Author: Dag-Erling Smørgrav AuthorDate: 2025-11-21 06:28:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-25 03:18:24 +0000 openssh: Don't attempt to connect to unsupported addresses When iterating over known addresses for the requested target host name, skip those that are not supported by the running kernel. MFC after: 1 week PR: 195231 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D53588 (cherry picked from commit 5818b6ee552b302f5300934f9b8cb94881867a5f) --- crypto/openssh/FREEBSD-upgrade | 7 +++++++ crypto/openssh/sshconnect.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 98503de12ddb..815c11a8f8ca 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -181,6 +181,13 @@ skip setting DISABLE_LASTLOG which we've applied for FreeBSD, but the autoconf machinery really ought to be reworked. Reported upstream at https://lists.mindrot.org/pipermail/openssh-unix-dev/2022-May/040242.html + +11) Protocol selection + + We use the non-portable feature_present(3) API to determine which + internet protocols are supported by the kernel before trying to + connect to the target host. This avoids confusing the user with + spurious error messages. This port was brought to you by (in no particular order) DARPA, NAI diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c index c86182d13673..24da9aed0007 100644 --- a/crypto/openssh/sshconnect.c +++ b/crypto/openssh/sshconnect.c @@ -458,6 +458,8 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop, memset(ntop, 0, sizeof(ntop)); memset(strport, 0, sizeof(strport)); + int inet_supported = feature_present("inet"); + int inet6_supported = feature_present("inet6"); for (attempt = 0; attempt < connection_attempts; attempt++) { if (attempt > 0) { /* Sleep a moment before retrying. */ @@ -482,6 +484,13 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop, errno = oerrno; continue; } + if ((ai->ai_family == AF_INET && !inet_supported) || + (ai->ai_family == AF_INET6 && !inet6_supported)) { + debug2_f("skipping address [%s]:%s: " + "unsupported address family", ntop, strport); + errno = EAFNOSUPPORT; + continue; + } if (options.address_family != AF_UNSPEC && ai->ai_family != options.address_family) { debug2_f("skipping address [%s]:%s: "