From nobody Thu Feb 20 18:00:45 2025 X-Original-To: dev-commits-src-branches@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 4YzLf64JP5z5pD85; Thu, 20 Feb 2025 18:00:46 +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 4YzLf55jvYz3F9J; Thu, 20 Feb 2025 18:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740074445; 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=81AKLMHe0QVYdeppVsvABUXSkBX2iaqyUow+72Zj0No=; b=QWsCJyU8VyTictX9Sg4Q5HLfP2rhPjY1pTj1PoXG2tXQEJhsRF8UuyntGxEV4IlHWMyoUh znAUKj4sGaLwnOHBiPiBASwyccgqresCLo3iNr8l18LEo1XcAiL1MzlWag846O2/eS96CZ jQemMFiFsxcLcnoafDXriHUktLZsrz8qFW9qcZ6nIVzbJBTVRIRPpSMXWVce0Ko5ri6Nsy EZjxVZGjdzolPO4QWp9p++6AzF1mGhSBDOpt99H6iu88fzDTi3a3Z6AowADX00zmuoNrCL L2Gvoa0rZBfJEbyRVUt1yrWrRgoK++Y0XkBwFqQ7noRXYJzjuUCbuSO5lgzB6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740074445; a=rsa-sha256; cv=none; b=kFFyUavzgUR58BGTbPAWoIenkzbSpCbQaacBDOiEU3MMH1SYkykn/FqJ2jbBS697eA2Rwo J6l6c0owpNRwhgv7Kl5vX9J7nQpLg0un8iia1XZySLIQ37L9/zimKVlzawjm93NdHErvQv mg53R2IogbDHg6pBZes9V8FHqKd8yes1pZl8JcGGNTv89Wfpaj86RAC7jbwUHSu4f9SeCc g1rXpIpmKjk94FS/f6DuCShHYZaoeRfDeAMFMgSqZa8WRou8FyMd3wziYih5R0ApMV/FDJ 7hOH010a0OK4izvjOC1cfKZlcv6Lu3AspmWPgVVTQbWDjPiXROvmKRM4T663JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740074445; 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=81AKLMHe0QVYdeppVsvABUXSkBX2iaqyUow+72Zj0No=; b=vcVftlW9MrnhhzK0furC4n3emK2d4coLmfh1lYXigNTR7a7+PH001wAPnxWUcCePhL8Z8X xvPFfcjzpgakFM6ulqweJ7neYReWo+iYjbV/03EqBWB4mstMHi3rHyEz74LRIVoNbPc1Sz ELArSpZRlZZ9uKYi9XMyhYBNHVJZJNZJPGqdD77xgu/+hdXfRdzO2IkrIlft8nILvmIJo/ Vdse2Sl9jPzoinE4X/uZ0TZsNk48fbuJURtd4/oBZOATiaZgxVPWK1x4MgBoU9gb6a42ew NN0YUicWxQo5I8fTpesKDm+2boUuHq/H1p2ySEZletuYBhdZ0g3UmL2Lwjq3cA== 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 4YzLf54MXbz12Rl; Thu, 20 Feb 2025 18:00:45 +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 51KI0jNC079235; Thu, 20 Feb 2025 18:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KI0jgd079232; Thu, 20 Feb 2025 18:00:45 GMT (envelope-from git) Date: Thu, 20 Feb 2025 18:00:45 GMT Message-Id: <202502201800.51KI0jgd079232@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: fb309875333c - releng/13.5 - ssh: Don't reply to PING in preauth phase or during KEX List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.5 X-Git-Reftype: branch X-Git-Commit: fb309875333c2b8c664acad77ad54f87c698925c Auto-Submitted: auto-generated The branch releng/13.5 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fb309875333c2b8c664acad77ad54f87c698925c commit fb309875333c2b8c664acad77ad54f87c698925c Author: Ed Maste AuthorDate: 2025-02-19 03:00:45 +0000 Commit: Ed Maste CommitDate: 2025-02-20 18:00:11 +0000 ssh: Don't reply to PING in preauth phase or during KEX Obtained from: OpenSSH 5e07dee272c3 Security: CVE-2025-26466 Approved by: so Sponsored by: The FreeBSD Foundation (cherry picked from commit 8a16d0831e70530b2fbd682e748bd051de35f192) (cherry picked from commit 34798cb576bbd2064ab8da372112482bf8e2a7e6) (cherry picked from commit 3ea366f74475132a743f8667ecafe4a091a29d48) Approved by: re (implicit) --- crypto/openssh/packet.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/crypto/openssh/packet.c b/crypto/openssh/packet.c index 2d1401e7c9f5..d8fbfa28b800 100644 --- a/crypto/openssh/packet.c +++ b/crypto/openssh/packet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.313 2023/12/18 14:45:17 djm Exp $ */ +/* $OpenBSD: packet.c,v 1.318 2025/02/18 08:02:12 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1774,6 +1774,14 @@ ssh_packet_read_poll_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) if ((r = sshpkt_get_string_direct(ssh, &d, &len)) != 0) return r; DBG(debug("Received SSH2_MSG_PING len %zu", len)); + if (!ssh->state->after_authentication) { + DBG(debug("Won't reply to PING in preauth")); + break; + } + if (ssh_packet_is_rekeying(ssh)) { + DBG(debug("Won't reply to PING during KEX")); + break; + } if ((r = sshpkt_start(ssh, SSH2_MSG_PONG)) != 0 || (r = sshpkt_put_string(ssh, d, len)) != 0 || (r = sshpkt_send(ssh)) != 0)