From nobody Mon Jul 01 08:23:16 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 4WCJvm3SZRz5PrHm; Mon, 01 Jul 2024 08:23:16 +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 4WCJvm2wtdz505l; Mon, 1 Jul 2024 08:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719822196; 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=NLDz6pv+DWYiWulJYuL8N6TZoNWuNqGquYYUMdEvCaI=; b=M5ByK++BQECqa/nnP/XesDze8j0jre+LpwPChGwPNbuyh4lPHBxwEZRSp8P/1D7IWIAElo uvw5zJnRjCDpwDCSKQ1tNI5zVPyz3b2Gb84aD1UmBwHNpEOer8OjwXKpQA7Fi7sEnJyLkR PFznQ/LsbkVL5gDjZTV30N+lM4lrqIUwVcG0CsF1PYe8NIkHeI1lJUlF5eFh42ktnrKfl1 YsPXWaX3X9MyNMCP72WGjW4HFY9q004b0q9LZzt7qhsZW/gh8MN4k8lqAkxmVhxBxGMGDr QRy0BEVfX52v6cffa0kxQyM6CjyExssZiVXugeUaMQfW8wtyfGRWaXyB99DpXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719822196; a=rsa-sha256; cv=none; b=qmjNFic6tzBesaJUiSsqc085xAFD0/n4eSAgVAiSPOVZmT1Ad8aCePd/ayGT+Ee57+6fUU tQgglB0KCPmt42PdeiFTpAh/xT4ttbgFmw5JIVKqUBZNeELVjC4RSWStlamOxGW7zyTVCL o7IA2TL58h5QGib4aBjYJhd3Ux1EZ2AmxVnU5tz6q0Vh/RCfkH2dSc0ShyyRfHFpYkwkVP Wlj//8XQxvhAxzzK5AxBNOz3Gth0sq2K0ersJ1jBF43kExb9vthvQzcm6amyvGjtyYLE2o kOcavQK/BD12TI6k++OmHh2y0TVA2jAP23ibeHf2xdX5rqm0AcMsLvqNZlgfhg== 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=1719822196; 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=NLDz6pv+DWYiWulJYuL8N6TZoNWuNqGquYYUMdEvCaI=; b=GucUnwAEO/B++8KAF7H9vQl5npdhEzoOSEv01HhaLEUciKmi8FHzPudvszZxAVnmd7bGTD pdu+FFDxkrT1EtCtJwrxs3d4C6VLq7cFSvJnke5TgubsBFKCPrns9EjDcZxmQEeOkxE4+i 7ZAxo6PZPdHnRfv/rWNrrfiCKYv+6xwr0Ma800VqLQ1LsZYHY4vl84fNo89n5SzwZOTKkl Bv/dcCGG6oyjxSZK8t8JR+Pjvm727Vb3UKnTMTAW7TM49z/AY7/0tWJq0zYZreJ29AIZ3i eBRySWb2JUraONeXF7syHHhgFxlwyTAkPY2oslsE2xCaep1QsxCW8UJlACg6Sw== 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 4WCJvm2Xf2zy6F; Mon, 1 Jul 2024 08:23:16 +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 4618NGNY085575; Mon, 1 Jul 2024 08:23:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4618NGgm085572; Mon, 1 Jul 2024 08:23:16 GMT (envelope-from git) Date: Mon, 1 Jul 2024 08:23:16 GMT Message-Id: <202407010823.4618NGgm085572@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: 25cf430cd551 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 25cf430cd551158135ef6f0c1aadf273ff3430c9 Auto-Submitted: auto-generated The branch stable/13 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=25cf430cd551158135ef6f0c1aadf273ff3430c9 commit 25cf430cd551158135ef6f0c1aadf273ff3430c9 Author: Philip Paeps AuthorDate: 2024-07-01 08:20:01 +0000 Commit: Philip Paeps CommitDate: 2024-07-01 08:22: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) --- 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"