From nobody Mon Jul 01 08:26:05 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 4WCJz15FZxz5PrQK; Mon, 01 Jul 2024 08:26:05 +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 4WCJz14hB5z50d2; Mon, 1 Jul 2024 08:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719822365; 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=FdmjhrcX0OTGBed9zncYuEMCTmeRr/MesJ90lO8JMIE=; b=p1o+6bMq/ZYsCiODUsYmyq5f2pU085lV3+Zu/cVHl7o/Zu/zv9sGxxwlK8kqgqy0chGo+q pLS0mN/jFe3vZD0KVRga3SvYWGfDZHK66+0DDU9nf5oU5Ldnv4NPKSkHQLfPbZ/gcvX4tp TCNG53Yfrjc97L5FXMJs8Z4JHX062OIRrMRSVFsO9/SquAGKPREqxKlcsHH43Aoa1b2KfN 4HaKoaMtFWhksFOTTw1c3aZsVNTU1LslD+Io3+rgGsog+sKG76k/KJIG9VrObmutWqmT2p boefPDLNwoH+xgpx8vGHNCyE8myeZM4P56OGe8iZlT0JfA6alJCAb/UNbmfXdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719822365; a=rsa-sha256; cv=none; b=MzgQNVhLX9z1ddFbAvFGSgJrwD2Mc6L3UoeEJG97Spl3QKyFa/P8qiIOfXYu9byNaiDNIq 44O6dXAs5SUXHcL1CagxR42DjwiaYhLM/VUdW1doja246jwbG2d/aVujFv6MW4UpvqLOLI ebCVickiCHG6eCgmrWoWpBqYOYxsUcZxzequZmwAwRzKG0Gd0HhzKDfenuhUZYURQv4dIG 2Jucf95V0T6EdMN4eu8460rtW16y8yUD0hKLONbOIZ6e/xVkNTdysKU9cs32FniM5c0BCR LCnesVv5HDD3kRSEefwHbWD8uf9RuZWeweD6coZJHdzKaOK/9wonRQ2EZCx6ZA== 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=1719822365; 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=FdmjhrcX0OTGBed9zncYuEMCTmeRr/MesJ90lO8JMIE=; b=yO7ewrPa3RB+YI4Ij2VVw1iAzQaw/a3cQFJsdqelUGrteh3wf1ReEtGtvwMD6PPCptFLMX JfaAN1v1TKK6fndEFkay49S7sbO48Wi8+mHRHYHtqs+n0oMMmfNsswO6Mtvegt/6ibfWGS 20U+5OnCdUlgq2ouz/18X/7hhfoLiy6wu51JfN8Pc/CpTL3yNnn/w82JQhCVTGfe1u8EX7 5vKfvEkvRPm8Y/IOtSB0iIFTgFKVSMfpyKfVPoCnucFU7uBYeQ2nEfXrAZupkD4ft+3FvH Awcne2+JpZ4EdvZeWn0PCGLW1CTLb+AIMS/5W9RdcUYZmKpEcNm3IHiN7q6tQg== 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 4WCJz14J3szxQL; Mon, 1 Jul 2024 08:26:05 +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 4618Q5Wm086283; Mon, 1 Jul 2024 08:26:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4618Q5l7086280; Mon, 1 Jul 2024 08:26:05 GMT (envelope-from git) Date: Mon, 1 Jul 2024 08:26:05 GMT Message-Id: <202407010826.4618Q5l7086280@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: 70eb00f17b31 - releng/14.0 - 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.0 X-Git-Reftype: branch X-Git-Commit: 70eb00f17b310f599b60939c1afa326c7b2c390c Auto-Submitted: auto-generated The branch releng/14.0 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=70eb00f17b310f599b60939c1afa326c7b2c390c commit 70eb00f17b310f599b60939c1afa326c7b2c390c Author: Philip Paeps AuthorDate: 2024-07-01 08:20:01 +0000 Commit: Philip Paeps CommitDate: 2024-07-01 08:25:43 +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 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 ba3690668818..56d02fbe9c86 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-20231004" +#define SSH_VERSION_FREEBSD "FreeBSD-20240701"