From nobody Mon Jul 1 08:22:13 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 4WCJtZ0fGjz5PrFq; Mon, 01 Jul 2024 08:22:14 +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 4WCJtZ08Gyz5069; Mon, 1 Jul 2024 08:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719822134; 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=l/lSxpkvqfBSy15ZXZoSr6PRu+7Ts5IPmaOAJnUPnxk=; b=j5MFlWABjkDiPNyqLjUmT8Qu+6pgQv82G4X6KRBG174ASkaqp9zXFi1ZkmrVLTdIWf70Lo mINqB1sXA2ulmcIyrmxoo/Su2K/VIKYaeBXRXbTjZNEF0QM0jkuFF1Y/RrUIwnL7N3MGiy 6hMwW+3IOps0ZcIwgWJRAfhoGwHhJEWQcW1Tg4EuWB304OfUVca+aJko/LC8ZFaQ3z8uuS 1pGBfJusbqB9xzfWVpoRf2kpWBiB5qGQCPCzpQJ1eC8et84U2QKqfBMoSSboHLXLv9WhcX 6TTpIedlf/b6VZ1MRUZ8wJatZ2TP2PvzudP1spHL6Dlp8QMv/ii6wyFgu48hzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719822134; a=rsa-sha256; cv=none; b=vcQbSjTKVUlj3FODrJmwLtS1Z1+vQtZV/MZYtnghlLLu5Ar4XE6GNlcLzddacPaBRSYSHj auokXY2HVjnxj5VaB64w/r8lJBlqTN5ocVVsIrBA3LPryT+1q90GcUvRQVR8hUJSgl6G86 lwovTpYaZlg4fTBHCo0fgjzpATCqvlZ1lwMayTYyXG+8sxfx7FLlvBeoMhOyI1c5Ew9rzZ hxnKxgOeO5xL8ywnHShYsYpl0iBe+0+DNksB7aG8QVyc9y+e0VQ8ROqUfvv/85o31LEiH0 HAucTL6ZzkW+RgixiDnFCCKL9wIOHTo5JRx5RniC9iF/7bTII8hstd4DSPmq8Q== 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=1719822134; 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=l/lSxpkvqfBSy15ZXZoSr6PRu+7Ts5IPmaOAJnUPnxk=; b=cCLuYACSoFQLdhfIXD2TKsiRJ3NWLyXIXhLz/9ShtgbgwMY0Lavgf4x37xCkIsoaPHFT9n Hykysk2Wa13pRtnPsu7W9rqyB/pUGVDWkNpb41XgZ3Kd+c7udvmSnPTmfHL5X23JNHgwl4 XXtTooKbx8auhRf3GXzYNAUFZ+FIEZI9QW2Tx6CtB71Ixr5W/cZAIDjB7QcjUlkSWESk6l SDTV7DFQrMJRIdCwA7vOGBpi/9ddDC985ZCnCG6v3DqYspwrD8TiXEH8rhvVn0h90xISwg WonPH+rbdgr0EHmBS2tUNP58oiSN/ReG7rSvnsz0QMCtHSfbbKJe0qsHJR4OUQ== 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 4WCJtY6sQKzxjd; Mon, 1 Jul 2024 08:22:13 +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 4618MDtP084404; Mon, 1 Jul 2024 08:22:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4618MDN4084401; Mon, 1 Jul 2024 08:22:13 GMT (envelope-from git) Date: Mon, 1 Jul 2024 08:22:13 GMT Message-Id: <202407010822.4618MDN4084401@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: 620a6a54bb7b - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 620a6a54bb7bb6e1c5607092b6ec49e353e0925f Auto-Submitted: auto-generated The branch stable/14 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=620a6a54bb7bb6e1c5607092b6ec49e353e0925f commit 620a6a54bb7bb6e1c5607092b6ec49e353e0925f Author: Philip Paeps AuthorDate: 2024-07-01 08:20:01 +0000 Commit: Philip Paeps CommitDate: 2024-07-01 08:21:19 +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) --- 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"