From nobody Mon Jul 01 08:27:10 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 4WCK0G3NWtz5PrbP; Mon, 01 Jul 2024 08:27:10 +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 4WCK0G14yVz51Bs; Mon, 1 Jul 2024 08:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719822430; 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=n0dDMMvjqQoVLAcL5v9R0GEXNTKcFqeCJVzko/XOoCs=; b=hJpHsq8Lh5L+hE0IZ3EIuylrcBqEPZuQqiFX/t5eBZ7URbtKYP6Gf9CoHTvQgZsKTpos1I y7deMQ+eJsGShXrqJ8Qe+0+R3hFZVJV5cG6pg2nleRCq9xwFy20sfFLmyqkSn95g6KDAnd VWGqmASVC6IewzO/wsDkv07ODn35rpFaq9WSaDVzNaVTQo2qsNULdREyOL8XJqosuDETvT 4uyIfLslF9zU/q4FojiFi2Ply+iB4RhE2mMYIV64GJHuERdoCUXWwqO+k0Raf6FCz5FQVN XEmayEqTAjjpWLhtVOJZ+Tht2Hf051Sgf4Dym1VfCNuI8XvSnLhrfkm5UtocHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719822430; a=rsa-sha256; cv=none; b=DAs7Ez6sx0gcNYpUnD/0EH5CL0fANLibOAFcAI34YwZe3qPevKEH2GMZmvyxVo/lYWbU6m vOa67DQUFSz4TXJHVwnrVFnoh/+16Dp41du72xwR2H69PEycYuh6O1r2jc6GHW2xJmEzlh kHZq3CKexsEtVaCxRz2+bo18aPFhY+kZCswUWfjmdTZN5MYAOGb6TXivyItsaxWBm2iuwZ EtiUA0/gYCTYZPUw0M7WttBcV6OKTB4+tDKQoRUo6zF9veWaz1pQOC4UYtFoo5TsZ17gLT gRTI0GK5xQnSWAxE1ZNRLPnqF+S/TM/7niyL3IVugfOuBahnlqPDi7rViMZ75A== 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=1719822430; 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=n0dDMMvjqQoVLAcL5v9R0GEXNTKcFqeCJVzko/XOoCs=; b=lKocImN0E82/V/P24Y8BhcIs+bm3j5QA9k09IcmWfRUfKbXdHOLXE34KGafyq6HKXRP9w0 bgMAMh1uU7IdjjXhZ216xmdh2/aFOKwozeYnOF51cBxlKHnzBH0tmfwPxC+N5Ho5ngtScc 5wyaM20upwmZhkuggF4MeP5kH/nej+S42uQj2kWP92mV2biEdkoWp55Bece9VmnyecWUpZ n0Fts5TqOzQsQpjjyH2DkzhwGArmgOQoxsgruGuQjONkV98a7uAX1lTgsx8qvWUPycrIlp oI6Zdgilm9KFLNIV10McR4enp3IdYizPOxjJF9ZF64CC27CGt9WenU3Cuz/DqQ== 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 4WCK0G0jKFzy1x; Mon, 1 Jul 2024 08:27:10 +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 4618RAnp086521; Mon, 1 Jul 2024 08:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4618RAIQ086518; Mon, 1 Jul 2024 08:27:10 GMT (envelope-from git) Date: Mon, 1 Jul 2024 08:27:10 GMT Message-Id: <202407010827.4618RAIQ086518@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: e3e0912f2977 - releng/13.3 - 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/13.3 X-Git-Reftype: branch X-Git-Commit: e3e0912f29771deed47955c36d38a8eb88ae32e0 Auto-Submitted: auto-generated The branch releng/13.3 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=e3e0912f29771deed47955c36d38a8eb88ae32e0 commit e3e0912f29771deed47955c36d38a8eb88ae32e0 Author: Philip Paeps AuthorDate: 2024-07-01 08:20:01 +0000 Commit: Philip Paeps CommitDate: 2024-07-01 08:26:49 +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 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 6b7067e19f8b..3e99bca450b1 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-20240104" +#define SSH_VERSION_FREEBSD "FreeBSD-20240701"