From nobody Wed Feb 19 14:54:34 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 4YyfYl1VjGz5pSsP; Wed, 19 Feb 2025 14:54:35 +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 4YyfYk70C8z4Dxr; Wed, 19 Feb 2025 14:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739976875; 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=hRDf3aieRRWtFiV92+ibjx1MzMPJxqxlwra+CLnG2nw=; b=Mhd/otRV/mFWZh5M+v2F7k5sGdklQhl7wNAWWWJkzlpoDbu2Q1pL/Z2XvPgZ25GpOj2lT8 rBmXMCf7O3gkFQX3NIyNv+PjTBKZHtlk2v1FxBhU7kzDIysGG0VfdAxbvhTyjGn8DlBXwX hEC/2S45ha0XR7r4H9zYlKUkqbz8A5giV2wZWHUZtP5Dl6KzpYXAw3RhBnI1l5lar0FvKn UPvgeatccD5zwZD3aYhpnj87isPXLjcxlAqnZx3aVfi1NrTBih8we8PHDhrvfOFUz4mq85 1ot0SuyemHCvH9tmA6ZYuS3B4hXeoao4M5QmHM/7x1Aapp2rKz8unKdoFI9wEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739976875; a=rsa-sha256; cv=none; b=MPuhl+Rxk8rCDla5WQE5BbM6lZh7T1KE6c9Hm5jvl2E5a9GnfjsOO49qVNXuzHLuLpVysO C/7EFqA2gKyR4rZiRDk3DNR30C4+Ql2EbriV/vhBuiV1IHVwE8/8xUrRQmQm4Hau53tLdr L+EXBBdCPN85rQ1yR/zvAMGlXjTDFTKbsnpuE/magNcmSKaWWCuLzjKmMEI7ulXsDO0IoH bnY6XmMd2j6nMPoLAaof+vZVRo0sVoUDRrfiX2lTcXieNXdHfLkyhrEfHS0gIYwnfOT2Y2 RXH8mOCvBN8qu3Zy1yr7oEpTHUO6JWTmGJb4z6+evHl+gE4jTFmQSuGAPYmd6Q== 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=1739976875; 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=hRDf3aieRRWtFiV92+ibjx1MzMPJxqxlwra+CLnG2nw=; b=M0eINOnEnoRJiXgf5A2+7QXWSprwnWajADpenvfi/bIT9sjALDzvao5anToyQTv8f1UPBM P13RKPNmJvgqmgHxBNLeSOPH12N3pmrM2yziqETXWhd4ZqPu/ozX/y6EOwJ2IxwLGFkZ70 ZuBio2PJwk4vKpk1DNWpNIR3c+r6vv8OpJUhosHQGUObs1IO09ThlZkpv5No1ff4xE2CrX mzBrSuqCvVVz3zDPTrY/GpcF8xl14XQozDAYQYlEJwcjtyH+G09auR4nD4OVGv6cyUiPQf xGPf8v+brjU1rcCQHAHgQxFFj/2b1XNeqXw+iXlTywxJhTXbjKcbWbB4mJUFig== 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 4YyfYk6RXHz19H9; Wed, 19 Feb 2025 14:54:34 +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 51JEsYBE013130; Wed, 19 Feb 2025 14:54:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JEsYDT013127; Wed, 19 Feb 2025 14:54:34 GMT (envelope-from git) Date: Wed, 19 Feb 2025 14:54:34 GMT Message-Id: <202502191454.51JEsYDT013127@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: 34798cb576bb - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 34798cb576bbd2064ab8da372112482bf8e2a7e6 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=34798cb576bbd2064ab8da372112482bf8e2a7e6 commit 34798cb576bbd2064ab8da372112482bf8e2a7e6 Author: Ed Maste AuthorDate: 2025-02-19 03:00:45 +0000 Commit: Ed Maste CommitDate: 2025-02-19 14:42:35 +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) --- 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)