From nobody Mon Jul 1 08:27:53 2024 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 4WCK156MYkz5PrY4; Mon, 01 Jul 2024 08:27:53 +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 4WCK154QsWz51Fq; Mon, 1 Jul 2024 08:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719822473; 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=NAZQaN5ZE3zxStzUf4xJZ8eLLUwMztgmQjfe/Updopc=; b=L0+zntcuyUCLLA69pilf1j5//IgbnUdojjnQtYV8Qx9u6r80hROIDVgaDOxKoa2AxNAzcV I82Wz+I/BOTBI7ls2D0nUod6LbH3sSWdqgaLsun1ojAeEDqzRWN3cIbhjeaiZZ+iNg033M JWbDwXlrNKQqluNMmI6S/nYJUFqlswTx1JVOVRXm7XmU8ZXcAbrmrKOK1fcJwdv7t6XSvx WJhwzVWbYQyyUipwb7vxCv4AX08hEa4VRNRPZXPsmHW37frVEl9zVZnRVGoeQtERNoPL0B 7NLqNJvsSP3WXZIeiQ325l1Q1q61RF+BYO0ry0drvkNR7JZ9MRQmuguDZ7h9SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719822473; a=rsa-sha256; cv=none; b=OAGI2elgWPGZnYejqFe61dgxScUJS5bJH0Av2RDAnJ+TP48bSZ0Gii7WIkLMAzsbHhLWWW m/8DWt1sy8/Pcd02eADYjn5rclSqmMU84hINKD2ItxhuD6kn8JJAPkYQu3Qje5OptzOvTJ ZyUcV/H4XAVo8VcXvAv1CfkxaZo51V2Jlm20F03zAjb3k+7ggvt4cCnAhdYZSy15W93EP9 Erkwf8rn+pL2Z29MglyOI1h+C/hTwSyn0OugxZE6l6xjgOlkZMM0TlOgl4baEHN9n3L2F0 ENw8TffWVGaJnj8cWFC7V8aIk617ElzgxPgM6U644q6UssOCN0zVEA107UxUiA== 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=1719822473; 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=NAZQaN5ZE3zxStzUf4xJZ8eLLUwMztgmQjfe/Updopc=; b=V7OluXghUInJp32BP2qyowa4tB0sZ5tMn0pXh87V1A+IPddOSMciesDW/otqTomT5vfFDl ZzFbPUG9wMDTsRzc/Fh8JXQL8P4I0dtMiDWKVCpZKm+6pqb61SbPwsh6qhLQIypV9LW/hN NNP74KgTMdroC/P/16zVs93+JJWrdOlAR4QOHVENOfibg8q6vDMGa2YnoIS8yxO8el2kSf JvIHFsnRvqwu1Y/GC2jMaHbQeXTt9zt14rr9cz1DTfvxRKkv38ur/FHerM1ZTsfQbXGhYN ba3hULpQLEKuOh8KjrBZCHiRYYjCb9Cc3NU+erMF1QUJNYDeztr7/T7B8vNjdA== 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 4WCK1542xLzy6H; Mon, 1 Jul 2024 08:27:53 +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 4618RrEk086718; Mon, 1 Jul 2024 08:27:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4618RrT5086715; Mon, 1 Jul 2024 08:27:53 GMT (envelope-from git) Date: Mon, 1 Jul 2024 08:27:53 GMT Message-Id: <202407010827.4618RrT5086715@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: 99ad94894edf - releng/13.2 - openssh: Fix pre-authentication remote code execution in sshd. 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: philip X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 99ad94894edf0585bc8c5a2b2a6eb7162db29a34 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=99ad94894edf0585bc8c5a2b2a6eb7162db29a34 commit 99ad94894edf0585bc8c5a2b2a6eb7162db29a34 Author: Philip Paeps AuthorDate: 2024-07-01 08:20:01 +0000 Commit: Philip Paeps CommitDate: 2024-07-01 08:27:37 +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 25cf430cd551158135ef6f0c1aadf273ff3430c9) --- 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 99bf046a792a..55e112f839e0 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 7132fd7b0780..138d256bb291 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -5,4 +5,4 @@ #define SSH_PORTABLE "p2" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -#define SSH_VERSION_FREEBSD "FreeBSD-20230719" +#define SSH_VERSION_FREEBSD "FreeBSD-20240701"