git: 3ea366f74475 - stable/13 - ssh: Don't reply to PING in preauth phase or during KEX

The branch stable/13 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=3ea366f74475132a743f8667ecafe4a091a29d48

commit 3ea366f74475132a743f8667ecafe4a091a29d48
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-02-19 03:00:45 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-02-19 15:02:39 +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)
---
 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 <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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)