From nobody Fri Nov 21 06:28:42 2025 X-Original-To: dev-commits-src-main@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 4dCQK72Gsyz6GfYR for ; Fri, 21 Nov 2025 06:28:43 +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 4dCQK703lHz3mWV for ; Fri, 21 Nov 2025 06:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763706523; 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=kjmcwT4yeWN1ESJsutqjxr+cwGgWX/zCVAbYCSFlQy0=; b=GxECn+KvqHU9befDP655SKXVEF1kk0R5E3XyUfMnk3cWeLP6nKpGhhgm7y2x10SxvRNo18 mVriVGh/VxyEFqA4xEDbzncfYV/AmB4JDQEsrP5JDuT6m+scd52A/sLjDhaA1q5FHbGLdS ijihdZQkr8dvUwwIE8mVaDiIr3vZN0m6bsm6sMQyludvhtYBrMregtcG8Gl9onrM1MimDJ QZtenxJYf6G9VhdKwUjGFAzGJZ7dHTuaeL/0buBMpnvTGHgS/FX9ZKlsZOO5rOn5l+L6wl 1uR5vD1c45dY66aqoqnKKaOwzI0din5qzv/Qu60Y0WVeG3pRqpsxRjAVxSAfrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763706523; 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=kjmcwT4yeWN1ESJsutqjxr+cwGgWX/zCVAbYCSFlQy0=; b=i2fp5pUFsBfL2+/D/HAKRY/uVBJxkRFvGgEyGvtLNa0OksvbzxgrSj/1XarLLwJ1IoibiL P4IMc0vk9jAd7stva4NPKaxnhpcbB2kHmopHV5deHUp0gK+xKxFnJWvbGmiMBpX9EhgrTP l/P6jZ2OAUXCyP0iWE0QwagTMa2UVFjE5XZ+USU7AQ77Mf+9/3eHVzuz37mhP1mnwb7Q06 UJ+h6xcPfdTFF7+8/OZpbszuowLiY5tsIUop/raPUhjXQ5FtXMXeipKFw6VUnW5zZf4ZHH ixrD117Lh+O7kfdiG141tso1glELdYVRDr2CkC7/Gu7El0iXcnsPC9d51IzQYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763706523; a=rsa-sha256; cv=none; b=lBoY+J5k3kFbVakhU45v6RCv2JdsJi0VQ0MYbmRiBLKVPzb0DJx05bY5ebvRNuE4e5+f0i BoACB20M8HIAVhddWyqGXB6wx0A7JK7L3Z7A2ce77ULAUzAvJT1t9cR1Zp43xmC7hRp3NT RmTGoMg8c824cxRzsFv3i6LrQArn7QMOu5aZojnpWPJZ2rGpKqM79YlLOKu1AyxfoV6qmr fRX2gMrJDNPpu8YZNroS0T6Hbnu2fu0QFx/R7b4R2j80pOw4jDxpRGZZ9SnigpJiOVt74/ zgSuyPoZoz9oEbY/lZ4RyIGy4dHStNk3+ZbscZtHltFBNfTc6HJIyzHT866knw== 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 4dCQK65wklz11Ql for ; Fri, 21 Nov 2025 06:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22677 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 06:28:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5818b6ee552b - main - openssh: Don't attempt to connect to unsupported addresses List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5818b6ee552b302f5300934f9b8cb94881867a5f Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 06:28:42 +0000 Message-Id: <6920069a.22677.826922a@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5818b6ee552b302f5300934f9b8cb94881867a5f commit 5818b6ee552b302f5300934f9b8cb94881867a5f Author: Dag-Erling Smørgrav AuthorDate: 2025-11-21 06:28:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-21 06:28: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 --- 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: "