From nobody Thu Jul 04 12:55:44 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 4WFGpm3kRLz5Q4R2; Thu, 04 Jul 2024 12:55:44 +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 4WFGpm2xcZz4PlH; Thu, 4 Jul 2024 12:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720097744; 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=T8Hix2PMWhsQkcAWZTzz/ZlaSkjZNsnhqFzpO9Z46rI=; b=KAfrnw8xVlxzDr7LgaujzZk8S087MiBeUalpGoHfdde0jITxTvLNPe3+m2av9KqRpobL8S 0j4kQP5sS6ycZnwhp5vv8Bf/WTBFVuPuNAakuW2jWA/sa3MwtDz/1y2r2o6hL9AK1e+FlJ KI1xAAx4VO81ew8U0dGbIunNs/v2Fng2g9/1501ObUBStOk6yg1KIkXOi7HZqGVTy1lKF0 g+0ZcdBrDcdeE4dP7J0xmbGG/1+e079qRVb/YNn3WUMJeJz2HHOJz/8yx44/2R0p+Jt5nz D5HBe4H3ZTGoEm3GLzr3KHo9p7z8g+Fxmki1Suo8pxJs2LnYrRxsNXr5QfHQ5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720097744; a=rsa-sha256; cv=none; b=QHin1hDQinYaEOBQIT48Lc9u8gJA0mcdcHe40MVqzR0XY4o1hSqjgUeslaEvRnHw3yKnP9 qWco9oHOYhfCbOmdS2CfJZ42H1iOsNzs9I1mO9z+ShWIqesxsQp33tzpEOu3jSfJp8ne74 dOvWTNDY0HgLk8/TVPpAsji3A7DoA6ck9zPLJZqLx7lzm6cDjzOneYzXxAPD1wax4dtRvC AhzI2aEHPOu4q4F0hrIlo93/TankFCP5jeYcNrmEb63qCOEI6XIJsGTQ8Bt8eA+fDeEWXx sBuXf6SuVQPvTiFF7JoJIk1rMkfrBFHid5pltMvyyXu2yFr0n3xx2xpAHIbOjw== 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=1720097744; 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=T8Hix2PMWhsQkcAWZTzz/ZlaSkjZNsnhqFzpO9Z46rI=; b=C6lHcnyjZFNEJ6Uq+ZLmZ7LubfWwJ6GmnZ+W5wmAbVs6FQVBS7wSTgqf9s4rcUoF9DDCQE b9EQnXQMMJoo0nqQGGF5sYU6FsA+sRzifyj0rqc8XgmjlIveLwneJy1EZMKGxuOMdGhwez r+7juC7II67Vl4PF5BdWH5BQik3RZoy/vS9iOVxO8eKlXeWd4NBjYMgxoaaPlHkqs+qBBM PI2prIwQsZe0ROibHJceY+pxBCg+v0Bk6jUjI0ccano7vRm6ulaVYh5VkKtAHEx6AY+bWg Tal8qLvtPE/ZZWhnURDTIeMBybleWWNJQR5by/GH7ib0s7dT1KruDvesQHxoZw== 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 4WFGpm2QL0zF0v; Thu, 4 Jul 2024 12:55:44 +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 464CtiGl025289; Thu, 4 Jul 2024 12:55:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 464CtifA025286; Thu, 4 Jul 2024 12:55:44 GMT (envelope-from git) Date: Thu, 4 Jul 2024 12:55:44 GMT Message-Id: <202407041255.464CtifA025286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1980b3dfa1f1 - stable/12 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 1980b3dfa1f15920ebd268f51813eacd87432f27 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1980b3dfa1f15920ebd268f51813eacd87432f27 commit 1980b3dfa1f15920ebd268f51813eacd87432f27 Author: Philip Paeps AuthorDate: 2024-07-01 08:20:01 +0000 Commit: Ed Maste CommitDate: 2024-07-01 13:25: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 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 3f7069aba20f..46d984ece1c0 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -6,4 +6,4 @@ #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -#define SSH_VERSION_FREEBSD "FreeBSD-20230719" +#define SSH_VERSION_FREEBSD "FreeBSD-20240701"