From nobody Mon Jul 01 08:20:36 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 4WCJrh5BP4z5PqxP; Mon, 01 Jul 2024 08:20:36 +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 4WCJrh4jgTz4yKy; Mon, 1 Jul 2024 08:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719822036; 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=965o02XjVwQmiOyTyngCqT2koCd6IdCzxaELb+YezfE=; b=bG5xqUiVxCOoi+fjIfsjj7OScU1xYZedeC6KO8bDpUxH5dVTztGimYyb3JdozEu34sWpLS 49SCbgiv70ckQ1bJRQwGAOR2kaevLdJQSV5NKt953i/tGhHVFWEAc0ySwqbcks0Kv3wQzO f9zDfvVcxa+gry8IOKl1XFD8P4NYRfk8OlT4nuJ6c0K0O6djMzd2s49thBZ9kb2JmTKBOj KwmiNxVn2UgIfL9CRvF7Jco7398owt9A9Iz39DdpNOjHGpWJ7ObJAV3ir6El83bXSx8Utv wGWM/CveGSbq0SCjXqRqzKzf/hDE4F4XUz5X/WEEWOGAVsF+mY4H9H7utvjv+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719822036; a=rsa-sha256; cv=none; b=Go3RwkBptnQahuc8p+Nz4ZZNJtD/W6GirXKXBPmrHfcHXzZocsCg8QEymFX3HZMXaKSnq9 5gBFp2RiL7nhqjuqNFuPSQgxei44x8OAWqSCnOsV0TV4JmLGsi2KWgghn8TCBftRwTCmIS 5+CHXNujkGUrnQQY8uvnVmm2yOHWd+P7dblqUAg0Bvru5FZsnksg2pap1ZRyGZnLwNAKew J3RyKuYqmMfH8RdCHz11rZsy65hOIR60yURuhONi99yhQ9pKUaFQqDPEWqTAoJvhd9U7vQ NlTd4XmsNHGXi6WZw0DrzBEArL0TKQktXnSpGz5W4qJC8N9fWH1IooKOht3fFg== 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=1719822036; 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=965o02XjVwQmiOyTyngCqT2koCd6IdCzxaELb+YezfE=; b=fdvE0+3Php2jGEiH0Tvw6gaJ5i5Ltd9T3MQ4/k1SpaggzqRxRpkes6syztvinMIWiOXIBX gxrHaR6Hap/EkTn2rDLrTxGOOyrJbs/zxG4+01MX7xuMi1SmD7n5R5TZT6n7wqRaAkDi6c jw0denO5ChPggbgXligkPmwmwdlRkjHC1s4YcuCHeMi72g5KmVyqTeXg/8bIisZkBkfAHE JzAbnqkVJqBnXeg3SA2WfYkyPQvfmFc1+0tebanKU5dBE5EirgkVVyZTNbUA+ZcdQU6R2h JxJMUN1E63h6R/ZxWxE0qjztL/D0rb1pefYOuhOMsSB+CDUfGgZQ3eAa+A7r4g== 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 4WCJrh4KBFzx0C; Mon, 1 Jul 2024 08:20:36 +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 4618KaEk078339; Mon, 1 Jul 2024 08:20:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4618KanM078336; Mon, 1 Jul 2024 08:20:36 GMT (envelope-from git) Date: Mon, 1 Jul 2024 08:20:36 GMT Message-Id: <202407010820.4618KanM078336@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: 2abea9df0165 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2abea9df01655633aabbb9bf3204c90722001202 Auto-Submitted: auto-generated The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=2abea9df01655633aabbb9bf3204c90722001202 commit 2abea9df01655633aabbb9bf3204c90722001202 Author: Philip Paeps AuthorDate: 2024-07-01 08:20:01 +0000 Commit: Philip Paeps CommitDate: 2024-07-01 08:20:01 +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 --- 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"