From nobody Fri Feb 21 02:56:47 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 4YzZXc1k5nz5nrHc; Fri, 21 Feb 2025 02:56:48 +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 4YzZXc08NKz3dvg; Fri, 21 Feb 2025 02:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740106608; 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=UO73cVl15/ogTzQtKK/ofWacc18WAIpoeADNpjCz5lY=; b=Zu1Q2RYMvhdo+1eJbG+CtYgQLFpWVyUe1RAtvHb3XL4jMAWJ2i73Lw9vZkQjQ7aZhyP+Mn /edn1duxRdmlULUYfrtDyA+IoqtHR5UAuhkgVTM2m5JLeRCXOcAr/ExW9tsa0joZoe5Dmn NQ9zKi07p15yf5md/t+r2IGFT6QOMCjJ9BdP9Tk7R/A4vxmCtTRlUiV55wWc+XCNs1didv JfMG579/GSp52cSFfHlv/PfeezweRLwI+iI+0poLZ0EdWr6DcOZ2jYvNu7dmRi2QNECtiV 7CLOpEJ4xHBDIxvF4d4LS2pRyp5e9yNRwKsWhkHFECtUyaH4CWpW1xpLJkbRdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740106608; a=rsa-sha256; cv=none; b=v35DAbXJk/t3PW+tv/Y2Ev80FUg42JnVqo6xQTFs8kNfroDLwYD6UBodFA6d9C8/nOONES h9SVU0VGO4tpLs0NerHLRPmXUJTIeki6w6oQb+TDGEAbT8z56wVF/Z9V6uMaqcpAoWMil0 ZAAtrqvFHUVWzdCBOt0EOHysFclSAgVM07tVgB56ZUuQj1ZHrNU9naywDI2XKVzZQBAUNo CfDOM9FY27d6Rp6IIVbzPHMupUInngPs7TP2UbLPDyGJjfTbjP4TfzFodi/fv7d/HPMqwU JbcSA+GdDWewITvdUOis6n/PcA7BfQ856/p5QyI7LNqiSYx+xz7r4oDMyLMqYg== 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=1740106608; 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=UO73cVl15/ogTzQtKK/ofWacc18WAIpoeADNpjCz5lY=; b=HmnGo6enY2NRpq1t7TMTsm9GnFKfbef1RV/iEW3kUbUWCk3EQQjGYUzSDrvDJroFGhgQKR 4YxHYnJjKjVjXjDYMkCMVZsBi0z0vjq7YrseXkb50VKUgvbvkn0uDCKZm/r5SuI0LoLfgB Fn6FRAdBhul8DVhfAxZcGjT8kZtMIt8/1gXxDvpSO2Tq7JMnmtWGKAEYLh5cj0z8aSrwV6 g8fuiJLaEYpFPWGHpsx2XsEvppGFpCccHgRUriXZZf1zz1iGR3XPtZcSc/aXuHD7WSjzm5 wxBrci6K8KCBF/qZNRoE0uU4XJnp9A3vKAVs9aTq4qq80TVO/WaIJMvSW+iE9A== 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 4YzZXb6kpwz1Hhm; Fri, 21 Feb 2025 02:56:47 +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 51L2ulGj080200; Fri, 21 Feb 2025 02:56:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51L2ulLK080197; Fri, 21 Feb 2025 02:56:47 GMT (envelope-from git) Date: Fri, 21 Feb 2025 02:56:47 GMT Message-Id: <202502210256.51L2ulLK080197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: c57fcc2d5307 - releng/13.4 - ssh: Don't reply to PING in preauth phase or during KEX 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: c57fcc2d5307cf1ad7e2d45d75f5bca9461d3c5b Auto-Submitted: auto-generated The branch releng/13.4 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=c57fcc2d5307cf1ad7e2d45d75f5bca9461d3c5b commit c57fcc2d5307cf1ad7e2d45d75f5bca9461d3c5b Author: Ed Maste AuthorDate: 2025-02-19 03:00:45 +0000 Commit: Gordon Tetlow CommitDate: 2025-02-21 02:42:06 +0000 ssh: Don't reply to PING in preauth phase or during KEX Obtained from: OpenSSH 5e07dee272c3 Security: CVE-2025-26466 Security: FreeBSD-SA-25:05.openssh Approved by: so Sponsored by: The FreeBSD Foundation (cherry picked from commit 8a16d0831e70530b2fbd682e748bd051de35f192) (cherry picked from commit 34798cb576bbd2064ab8da372112482bf8e2a7e6) (cherry picked from commit 3ea366f74475132a743f8667ecafe4a091a29d48) --- 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)