From nobody Tue Nov 25 03:19:41 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 4dFnx93nfbz6HMlJ for ; Tue, 25 Nov 2025 03:19:41 +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 4dFnx917Zmz3Txb for ; Tue, 25 Nov 2025 03:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764040781; 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=lQQXNbHATC1hoSM+V2EbGOWY3Vpx2lKwFS+J8Xr/O08=; b=xYYnseccjjq0s1z5vjwd0KOc6IVXKnO5LjC3CzE9lG5wh4s5IkGA4lUqdw2oXEvpxAnq3a z1Eh0QCEwxYhj3Ipd6E/+Hvv6zy4gEMvvgCQ7mvhdN3+j697PBeYPZspygOTCvmB6RWVdB vTozvySgXtvSvO13IFDxKwWyU4nt/4/mFm7djBLGVrr6T6P+I4vAIVZoACC6/rZlVKTwGl s9UYmXQNyqLRTGJQmFyyCdrchgbQuDwENbZmWtxfZpaNdE/dRRNg+WAoysR5QW0X6HJ91Z ZOGoh2TMo8onaZs3UJNwHwAmJ9YwVzIWohxUjv3cBJnoNYDVYusgx6erC2C0zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764040781; 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=lQQXNbHATC1hoSM+V2EbGOWY3Vpx2lKwFS+J8Xr/O08=; b=jca4+CiXTZCBX3TIjfqHeVgZXoM1d5Aa17+/RRlH83JqF55MIVItUSSMwKZePLV74axeKG o3j0Vmak48OBYtiB5uJdVecxycGZg66m0anjMcdd0MIXn1NZcKavSFtY1AXUHSRxl7kNbE 2CbbSysu+7vO4/Mv9JU2xN+c0fsSV8ZZclhUsj/J5viRoAew36vGGxLuTagVkXNcY/7La/ UzZE3oqgm8SOkL5pZqX90F9qGZ/FENibYE24jl4BC5TOFKLYjWqxOA25vuuFjJMk2TLDIo UwosUJM62Wgb1nMJHPoS5Q1J+0BRYah7dbNTYZzTzA7EcyOa4Hvt4UcCdcKkVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764040781; a=rsa-sha256; cv=none; b=nle1rz63LnqyU8J7JltH7Hei72wkwJL15J/h+WkGpEjaMcxSjMwcYVBSewormc45DvXQsh BKC1Pfq8cn2csls0BV/BKOB5mLekYPxFjPw9KTGrK4Pa/HTySPElgRuwSmpYJ7bSbHdqDy bxX9CeiygjAODI/MMDL0jy8x/ffjAsn1gFnserz85CAgOfpXhtuugqGDUU5m2tkBPdGnFw pVGS1+5AAQAnrTpCl4MZvL45l21iqCCQIZPPS3D0z/uIyn6vnLw0NxjbOg0C+qLuIlgWG9 GgezJP+tWHM7MuiiiL24xA1VQww+NwFdfNzhWqlhvDLC4XmtgyBXqLA6NNu1Yg== 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 4dFnx90LQtzjyR for ; Tue, 25 Nov 2025 03:19:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 329cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 03:19:41 +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: f6bd9b266dc4 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: f6bd9b266dc4aa342f735a7ade07061f54f7f740 Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 03:19:41 +0000 Message-Id: <6925204d.329cf.1813b80c@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f6bd9b266dc4aa342f735a7ade07061f54f7f740 commit f6bd9b266dc4aa342f735a7ade07061f54f7f740 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-21 06:28:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-25 03:19:35 +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 | 6 ++++++ crypto/openssh/sshconnect.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 625677c1a5c1..3742874c0729 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -179,6 +179,12 @@ ignore HPN-related configuration options to avoid breaking existing configurations. +9) 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 bd4190c6e8bc..91cbd55df0d1 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: "