From nobody Wed Feb 19 12:44:05 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 4Yybg94CwCz5pKYm; Wed, 19 Feb 2025 12:44:05 +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 4Yybg93LgGz3y3M; Wed, 19 Feb 2025 12:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739969045; 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=PEqgVuj7MdkfL0nXVZsxxxYQkleiKpwzpNe1clwsmjw=; b=OBRt5AwU6BWIhmRlUWcejpNJKbuTNaTpNoExsVx300y6hm5p/GgQZ+jY4Qi4y4jy/hhkEJ Y/VZlSGF/RV/aUP+i3jjjQq1ACvTRSCDg63N5lVg5JJbyHn0m+CVsYHptUhJJIl5TD5LXT xgNeV/rx2AbciULSsxsQMXbMTKUbk7NDbiSYljarHOzcxNvXqukwaV+WCa7BzaoPr8iZud zsLBFm5EMcgbmXloxrJXVYTeTrZxfils0+K6SFvR9XCqd/Z9z8eWFcBl9R5IoCgo1jiadR JpiBk2DWnFnZVYDz7zJH0edmQQNUjMrJkoHURTSy8h79i4PQkdQFoRr/f+PDRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739969045; a=rsa-sha256; cv=none; b=Vh/575kj2sIrYppAdc6det+ByVaMI7VIOyctO43tE4qoTPOfopsVTCUOqvFQRX3nL/v1Bw wwRvxcsj81mCL986wYHF4qEt6nRyPLgVNT6Y4VAfTC1EJznGYO9j/x5dIJgaqtNplploUl Jhtt4gT2rEDRtaq+2CHPCUOIxgNcPIG+gqtyNKMkAVMjvw8TdF0n1llfuXBoXbtjcmRp9N lK/n4jsaMwy1M+ecevQOauPr7R4fUFuhPNz7dmMUNUK0l+Bk8rB/6Fgr18OeGd1j9Bhrj/ 77Epz1VkORPAcseE4aRgS7kmpbZG1OZRv05vKPGD043xlINmUTUEyJnIjO+PfQ== 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=1739969045; 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=PEqgVuj7MdkfL0nXVZsxxxYQkleiKpwzpNe1clwsmjw=; b=tkz2tmUUpUrC4ahb4rgzLqvz7R23ZLSo82T/Lke2xj0ovj/pJ4U82pXR1hUfn6VutIvszZ 2Gq54/9q1hccw6qwb6Gvye+Rd1Ix5NvY7J/n1deLlsp7MqdDMcJxwy9u8XTH/59c7VKlZd bhkxA7M0muLsdbqrPchksahO5uj0da9oQksgeceyYio8DZZubgbDPdQjmvviSHgXs5+KCr Z0JVbZ/M8UTGZ2Q+L6uAKzDuY7LRLBChsz7esZrAuo8F7Wv7kejyKqpgSsOiboDkoECB+B FyEyIqEC/MhMnq+xuBUW10eiq//JVpgSIvqOdDR7O1Gudlu5poKC8QAn80s3lw== 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 4Yybg92xtyz15Vw; Wed, 19 Feb 2025 12:44:05 +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 51JCi5l6068604; Wed, 19 Feb 2025 12:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JCi5Hu068601; Wed, 19 Feb 2025 12:44:05 GMT (envelope-from git) Date: Wed, 19 Feb 2025 12:44:05 GMT Message-Id: <202502191244.51JCi5Hu068601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8a16d0831e70 - main - ssh: Don't reply to PING in preauth phase or during KEX 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a16d0831e70530b2fbd682e748bd051de35f192 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8a16d0831e70530b2fbd682e748bd051de35f192 commit 8a16d0831e70530b2fbd682e748bd051de35f192 Author: Ed Maste AuthorDate: 2025-02-19 03:00:45 +0000 Commit: Ed Maste CommitDate: 2025-02-19 12:25:55 +0000 ssh: Don't reply to PING in preauth phase or during KEX Obtained from: OpenSSH 5e07dee272c3 Security: CVE-2025-26466 Sponsored by: The FreeBSD Foundation --- 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)