From nobody Wed Feb 19 16:05:14 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 4Yyh7H4xsJz5pXnx; Wed, 19 Feb 2025 16:05:15 +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 4Yyh7H0gVZz3Vkx; Wed, 19 Feb 2025 16:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739981115; 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=ykos45a8yFjAwf+TKQ6c1tqTqAH61AFWNGSxVVUhxpM=; b=B0gAwiQdreUhdN2sJoqhu/rF7JOxBv546U6a7IvaoXH3l70Qo70g3e1AAN+ek4E2NK/Fk3 df/uW1cnUxlNXWO1jVxhSwIyptZOLtPgv3zJNzmMfajvZkfzSV1/G68Bz1+t4evLnnaxK8 iJFiWmvvu2fORSdtKvTiWWO9YgK8Y3VVd1oLpsb4gk6uenPG6JwX2l8+UR+ez4DH9W0M/q NCK7BbrTiVKFRWYL+AGyTjlFOkQQCTvAR+8KAansk72/ee34/WbmFDuJ9l3Ks5GapIIEGU QuxQOKftKgpJcUVE1tFopPUFdrEXt1C3+xwuCOyiA05QrzjFiUq7vLWF3SMGaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739981115; a=rsa-sha256; cv=none; b=XMw6Js6Pgwzggb4J8DvAwiRDko36r5K5Li6fPe3M7MFO7x1zwSK8g+QKpLolKaCjaBwXBN 36fHCd/VY5RrAZgSu8ZPwxKgFS3Fx51N9R8sgkkO+S/ugCD/bH1G+4wh9Ok9lhiFKyIfa9 QB6ikAn07eb681ocOmrq1bBOrgQxKj3YYUAE2f/iz2gKK/VeP5OhydW3rNGjTGAR2ijqPB NkXYW1f4UQ7vudor4t09penktWU2Eq6bsB/scQZYR8tJ+IVpRhBUv8DUP8Bp2Xcfn2hrEm Cijs5D6FkUyFPYHzHgfakxx1rZSfp8suFmm5vi6qwG9Wquq0sgbKwfa4C/P50g== 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=1739981115; 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=ykos45a8yFjAwf+TKQ6c1tqTqAH61AFWNGSxVVUhxpM=; b=mR/QzkcuYykT5sHJXZjaB6qivbMP8Mluwd2XpZzlJiQbmoIdnyFS5vfS8vECuTFWRM8uTv jC3PP5hYckYQHd5SpBNXwba57MhsaSsi+DBCpqm8R1gxf1oZfo6i8lT8HG1nxt5KXlNSpE SBPdkIqbIviQJD5RrGGKF78cwnDb1oDZu0GzVT94o8yF1Q/PnnM+aQVcluddSSgILLv57I DD5/IPeAjNQxCP7OIlKZjwtTsc0NV0Z/FyEhCL8ytBzmkpCmxvlscPKHqlT+6hqAat2VB3 aqe22WiKonYi9aMnrlTfQEwIWaJ4Xxk2Ur2+r03F1MWeqTWK85ZwoxuFXlIrCQ== 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 4Yyh7G5XX6z1BrX; Wed, 19 Feb 2025 16:05:14 +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 51JG5EDR045622; Wed, 19 Feb 2025 16:05:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JG5EqV045619; Wed, 19 Feb 2025 16:05:14 GMT (envelope-from git) Date: Wed, 19 Feb 2025 16:05:14 GMT Message-Id: <202502191605.51JG5EqV045619@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: 3ea366f74475 - stable/13 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ea366f74475132a743f8667ecafe4a091a29d48 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3ea366f74475132a743f8667ecafe4a091a29d48 commit 3ea366f74475132a743f8667ecafe4a091a29d48 Author: Ed Maste AuthorDate: 2025-02-19 03:00:45 +0000 Commit: Ed Maste 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 * 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)