From nobody Tue Nov 25 03:19:31 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 4dFnx01p0jz6HMpv for ; Tue, 25 Nov 2025 03:19:32 +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 4dFnwz6PSPz3Tvw for ; Tue, 25 Nov 2025 03:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764040771; 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=q0ZuCWrN0AhgaHM82zK3SW/xAZSTzOe4IAIZPI2M2xI=; b=L0FPKXvYJFYEu/Zqz/fRZguK1JPQzxlTfg+3JnuMaNPX12MYtq8NACrP+lLeFLu89Ba6Rc 5li8m1yw+g8k0NhVI1Jh6GaLmHFx4ikmvGKwXPRLY0PfHVPHH6FROt01uSMsj0dK2gJ6rL FWRmkwzTRPr8/0OaVbJIV5Ga4zUIxWdAhjpnmOKFkALrlySvZzTWjfOtiWeSZ8TcfxuxDt 4kgyXmgkNy7nJq3c5dynOPTTXstTuWi4GA3JgbUS9X3m82DpV/PLu6aoTIU4qr6kI8q0oy ar8A/V+AGt1V/Zje2ChwiX5vgdJHNjc/qrl1g5DVDl3Cyj9CJyBj5so2NHt0vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764040771; 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=q0ZuCWrN0AhgaHM82zK3SW/xAZSTzOe4IAIZPI2M2xI=; b=nisLoB8IXjfFRjX7BY9PBDxykrrzzY8txsS4uuuj6bVfXkve4isqp8PwSDx5FQVAXVvRma nnuwvpLZaPY/HA7hK/y804/TkpDuSTPNhb4pONMlNV9sk474j5fhQlb9bkbCsNO72aV4th PcO80tmuK8HgonsNYvlGfjv+M6CC9SkynJ6/DJpnKmQ61sNoBPaA49dG0FhQDjrVSgSlTL yZL+snzafe9+nCP41MmHC1CvVQca9dXlPtPYubcrpB4cf59Wouus/KkohDokSMd2HM45TT /gUOxH3meZPKwBwEJgXM8I6tumVVs52Ql4QEAz5cc7gVwC0OjWHPZLiQaoHZtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764040771; a=rsa-sha256; cv=none; b=iAGDtJgkQN2Ppl8D8GZkZC+Ud7E2qZWZ70cbNj/NxzZF26/ckAyzNl6vU/PhDrgbQULen9 vGFaBXWfGsfHXi3OGUrxZFhfE0SVC5uNJNW43gO3rET+iHrEmCFiHtSqS3KPY6mUD9tzd2 X1oM/QlH8HHrx8VT/Yc4274FiZbhDQZRNqrdOeFN09QrQraGxKfZz8esRjLh6lEhcI3CrM dBOZmoW0kpf5jCJMWZDaupcUOy64G2q9j21rhEytVf4pUn+5mSWaOZpMm4NvGGD4hez0ic rMbCR421akOiBacFzQTXlhNC7MPgg9RRX0pIdn7XA/X3HypFkoIqRJHSkZGmdg== 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 4dFnwz5xtlzk0Z for ; Tue, 25 Nov 2025 03:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33823 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 03:19:31 +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: 00e4b169f409 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 00e4b169f4090e3b4bf1454c989df82d94b7d62e Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 03:19:31 +0000 Message-Id: <69252043.33823.4e15c483@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=00e4b169f4090e3b4bf1454c989df82d94b7d62e commit 00e4b169f4090e3b4bf1454c989df82d94b7d62e Author: Dag-Erling Smørgrav AuthorDate: 2025-11-21 06:28:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-25 03:19:17 +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 efea4cda77b4..d8fc986b71ca 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -177,6 +177,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 7cf6b638674c..f0c080cb140b 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: "