From nobody Fri Feb 21 02:56:23 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 4YzZX81lhPz5nrJx; Fri, 21 Feb 2025 02:56:24 +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 4YzZX80zPGz3d07; Fri, 21 Feb 2025 02:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740106584; 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=cHhSrmudUeGloG39r+m/pkc2nQewaREI+GQY1yXmnkw=; b=gzpqu8g5wYhYasB/CmgMwDtFmIqFYejTrxc979koqHM1mAyBCVAWpfrwGtddA+YL85zyrW Ffe3Byzi8SfNqN+KkOcPwh5b/IUvwo9aFbmQeAOqJwIy5FsSDtq+Snx1wI2iGuo8ymI4en K8ux+faXCugcZt2MKjokEnwot8xjIPKUs0cwnh6FILaRRaoAOW/oSa5m6pxd4xT5F3TaTM 0cQUnWsik+1ii8fA49Ao2M7nsOHf4OiWHUbfX6y4Muil8gGvWLzLms7M93PUMFIO+oV/3s k3IrfGgRI1dKGbFCbn8Y2l/RMV2utu5yPxj6ZSCDGoxl2j9MHDnANxukuaVq9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740106584; a=rsa-sha256; cv=none; b=TFZvL9TzS4Y/8C7YbX3fzZOCu9j8I8tNT0LRKAXFIk4AuyB2C1KV0CAO0tJrZUVjbgF8Z2 CXKhucyqukLTdrfHzjPEq4Aw3Fvwa9UWJbNxIAAzEWMDD78253VEd9d4cpifyin/D4DzAF 3RgU4DAGYGPhLmF9MTwhiN+x3MTee+bGiZWBbzrQc7D8U2Mfr+bOM7G8D1/7kx1VVdyHE9 gL3Ic8TelB1ZKIpxyoQdm8vkur+88eBoiiX/AxBe//sefJwJrMXvwG872sMOhtnFfPNGD5 EjGGZmsK7WCy1+zgoQrDAz3RUlyyQD0D9HNgVkohKy74SwiZcKMRlflLtXmtEg== 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=1740106584; 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=cHhSrmudUeGloG39r+m/pkc2nQewaREI+GQY1yXmnkw=; b=J3im8n0zbFeuNy/SU5VLYSIJAPJbkb+wVIfZJu5Pn60dPmEhmyUbt0BGKiw8/UdXjjLp8E ZN6XCtw2wOVelWi+duubndNliuoQp737EAC/Qb0q2s5qf3hAM/ZCamM39quhzWvsgl+EmA aQHx+DtybWYhupUFJGWF0HilU9WeCtmBtj+ILXDqrDnlwoYejjX2XqomsCbwly0RivaX+Z 3+dPIc1dau7jIsNX5Bfd1DxXKc4D0BGnun8K4dV4JhWp2vQRxr8T+qHTiyf0A6eKmeoBfU zaNiacQg+3YJEYXxR4ursV2ZpE2yyzmWI9+Lv6RiQkGYUrUeUraZeWziPjKsFg== 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 4YzZX80ZMLz1J2w; Fri, 21 Feb 2025 02:56:24 +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 51L2uN9U079613; Fri, 21 Feb 2025 02:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51L2uNkq079610; Fri, 21 Feb 2025 02:56:23 GMT (envelope-from git) Date: Fri, 21 Feb 2025 02:56:23 GMT Message-Id: <202502210256.51L2uNkq079610@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: 3ae196925d29 - releng/14.2 - 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 3ae196925d2915e95e549dbc1687c75845ce87a9 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=3ae196925d2915e95e549dbc1687c75845ce87a9 commit 3ae196925d2915e95e549dbc1687c75845ce87a9 Author: Ed Maste AuthorDate: 2025-02-19 03:00:45 +0000 Commit: Gordon Tetlow CommitDate: 2025-02-21 02:34:15 +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) --- 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)