From nobody Mon Jul 01 08:24:48 2024 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 4WCJxY0sHvz5PrVc; Mon, 01 Jul 2024 08:24:49 +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 4WCJxX5wg8z50Nf; Mon, 1 Jul 2024 08:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719822288; 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=i3uF8PgJHQ0Zm+tP12nwnVR9PGMqJW2uTDn4ktHILSs=; b=k22Kbdw/7ID0dhgRbrzLpwPHDGxdoMlQytHFej872qyZrI26vIXTvuD6SGn1xzJs7egODO 993IVa4+eISf5zRt0XjOurAQWAPE6iy32QcpkjTEGCFtlGeLSwhb+orMOOBONTvtH/Rm9N NcTVrWfzm83fJFhcr9m7SVLw7REHrcyYBjti9gloMOmmXk9Fq6P6SMt4BXEL0g7X38pD8I RM+kw/mAN6WmyhHuZ5pZdG904wx5rgYPN7NPETZBNHzP1533KZCPlUTAES+ottrpU5i1qC itMapU3N+CuOCrm4nGPJpOHTTovH/LejAst11VUL+MpQvF7nfrEpBV3VMzE5Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719822288; a=rsa-sha256; cv=none; b=kiaCE/r0bN7y4f9IrP/4mobROAXqrfq2UkHIeloK3MpDcWt/W1lJ1ecUwEWpBxDOrbMtz6 bKCr6qgkVtBKBuExginQ8nlwsqAezETOot1Xpjma9UcruIyrriv3S+KBM8JTudZGguPopJ Br1+zh5BbVy4gE61zWiCx7y4JGyQIwZfARTfT2VJGSKUf/9N0qR9FxOJRWl70Y+VPZW4FS S+e6N/eOB/Jz6ZTuCk0jLAsCIA3uBXU7jvfh9R3TroKp4Cpysl5zWyKsENWQj7iXWK+x71 sFqDaVXC/u+PTcyy9zM335MMXyjWJPnlAdZWG9Vx5W9sqiR0hT1zg5aY2VjJHw== 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=1719822288; 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=i3uF8PgJHQ0Zm+tP12nwnVR9PGMqJW2uTDn4ktHILSs=; b=CEt8bsDYT27hJOVWXjvamA/5AMQXgovQnVTsCKKLD9KFxRoBqtYNR7+c84lj/ev53rqc+G t9lrDbT1q8Qt3x3JEJRHadBmwowXNv8SpbGTbn3ctZMArjow9lX3K18fRmBAS9ZyYMiQ2M W2QW4JJmzTOfk/Oks9Jgh7gNUZCtw9nrj+SjkAx6jLwynr/q6aPYoADCaP/ZSHulua4K8n NZuPhuwmjR/YDq1RkgZ2KKf+7s4/9kSwXyCfYfG9L9CLAbvYFWdFXvusDupTYyZiy//LCT dn2sabrhdGk30I+qUPOIkI4QTnoMtCyOx5tTTSjn/6Z93gPy7JNWN8EAZBYkDg== 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 4WCJxX5Xqgzxxb; Mon, 1 Jul 2024 08:24:48 +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 4618Omtm086001; Mon, 1 Jul 2024 08:24:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4618OmK2085998; Mon, 1 Jul 2024 08:24:48 GMT (envelope-from git) Date: Mon, 1 Jul 2024 08:24:48 GMT Message-Id: <202407010824.4618OmK2085998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 8f80def8aa08 - releng/14.1 - openssh: Fix pre-authentication remote code execution in sshd. 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 8f80def8aa085385dc4fe4668f0e29d3a0dc8510 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=8f80def8aa085385dc4fe4668f0e29d3a0dc8510 commit 8f80def8aa085385dc4fe4668f0e29d3a0dc8510 Author: Philip Paeps AuthorDate: 2024-07-01 08:20:01 +0000 Commit: Philip Paeps CommitDate: 2024-07-01 08:23:50 +0000 openssh: Fix pre-authentication remote code execution in sshd. Reported by: Qualys Threat Research Unit (TRU) Approved by: so Security: FreeBSD-SA-24:04.openssh Security: CVE-2024-6387 (cherry picked from commit 2abea9df01655633aabbb9bf3204c90722001202) (cherry picked from commit 620a6a54bb7bb6e1c5607092b6ec49e353e0925f) --- crypto/openssh/log.c | 2 ++ crypto/openssh/version.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crypto/openssh/log.c b/crypto/openssh/log.c index 9fc1a2e2eaf6..436c75630181 100644 --- a/crypto/openssh/log.c +++ b/crypto/openssh/log.c @@ -451,12 +451,14 @@ void sshsigdie(const char *file, const char *func, int line, int showfunc, LogLevel level, const char *suffix, const char *fmt, ...) { +#if 0 va_list args; va_start(args, fmt); sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, suffix, fmt, args); va_end(args); +#endif _exit(1); } diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index cfbb749c0d04..836b5650b247 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -5,4 +5,4 @@ #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -#define SSH_VERSION_FREEBSD "FreeBSD-20240318" +#define SSH_VERSION_FREEBSD "FreeBSD-20240701"