From nobody Mon Jul 01 10:55:36 2024 X-Original-To: dev-commits-ports-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 4WCNHX6nHYz5QCsM; Mon, 01 Jul 2024 10:55: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 4WCNHX6C56z4NWh; Mon, 1 Jul 2024 10:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719831336; 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=8mNDUKuk2U5STKKS0lm/W46T6WAaw0rwvkca4bA6FQw=; b=Z0SFTb6AfOe5/uKV1tPo/aFcow4OficA0HRBef1gPVgGkG0fG34WW7oaDFDxnxhEEs/XIB q/NjwQDOa83cthHhn5qjfuZNTbo6hwEuzDzagTSnD34Ft+SX83swbugCMDRjtibfzOpBOD CB+cLBk/44LE/HSsi/VSDPwsegM3Ykt9/9111Vp12HjVp+E9eTcKpk61h27c+PC9yEzsT0 6WjOE/WAK4NQGMf319ohK98mHw3AyoKQI5pYTmxoYlJX2H57xmTM69EZxzP7GHgiy40vYU XxygzQfROUA9Iccd3BsGWV/PPAjcly752yJGTkHzrDbfLoHfDbIYOL4lL3thVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719831336; a=rsa-sha256; cv=none; b=Fl8ka0q3jkr48WEgRzoVQ0QQCXwH91AUALm1GCxrAJ7Vu1xNZPR9AObofXAYcfxIvMH8e1 gZMHWnzFCO9SYv6zD8QHat9IhUX9bdhjhObZ72lYykp8FcLJGukawSxzxgrDVRkqQCC1yZ 8i2xW0xBYa6Nw0lCk3TSLp9gmPJwhYf4MdiRrqOwxDuQH/O1ovtCPry/Y1oeKY/MWSRfvt d86pBCqJOC/CBKW4Mn5OQlq+dPAJe6T4GAD8h9agE1eKu0aWzv1EqV+Drq0+xyIfazDSPs wiEHuNeDd1vVRkS5G+DAiqam1U5NDVQefDvbiOuT/YPooCKXQAz/y1BYW4VqSg== 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=1719831336; 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=8mNDUKuk2U5STKKS0lm/W46T6WAaw0rwvkca4bA6FQw=; b=UH2R6jPpnTQRDinTBUBP4WxCRo38W07GlUERDoHIotLmByL9L17HxSPR6qrpOaHkNiCX6d BYAl/mWmAOSqpHqMqt4SoWbfzqzuXW1OdAaOgNTHfzOUTGdhkNpt8kc1Vb78NRKc5I1HgF dMO54MIyQt6kP6rO1a6u4HnZVWO3VC06627JXwVVCn8qWBl5WezstnPx3pbCWbG7aWemEi WmWqvNYywEr1C/61H3J/CfX0urcmqAXEQOq8ordj18LPlfHaU2bkvZrH2Us+L/5FSfirKZ svLpVdIdEJN/g1INqHPf3rJJzsQwWxYZSVPMa0Okq+3/gGMch75ZWzjZ8XRC3Q== 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 4WCNHX5Y0fz12mk; Mon, 1 Jul 2024 10:55: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 461AtaII039542; Mon, 1 Jul 2024 10:55:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 461AtaUt039539; Mon, 1 Jul 2024 10:55:36 GMT (envelope-from git) Date: Mon, 1 Jul 2024 10:55:36 GMT Message-Id: <202407011055.461AtaUt039539@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 66a620a734b4 - main - security/vuxml: Document OpenSSH vulnerability List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66a620a734b489596452f342224330207c6e23b1 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=66a620a734b489596452f342224330207c6e23b1 commit 66a620a734b489596452f342224330207c6e23b1 Author: Bernard Spil AuthorDate: 2024-07-01 10:55:32 +0000 Commit: Bernard Spil CommitDate: 2024-07-01 10:55:32 +0000 security/vuxml: Document OpenSSH vulnerability --- security/openssh-portable/Makefile | 13 +++++--- .../openssh-portable/files/patch-CVE-2024-6387 | 36 ++++++++++++++++++++++ security/vuxml/vuln/2024.xml | 26 ++++++++++++++++ 3 files changed, 71 insertions(+), 4 deletions(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index ccf46bb23850..65f88b3e3f82 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -1,6 +1,6 @@ PORTNAME= openssh DISTVERSION= 9.7p1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= OPENBSD/OpenSSH/portable @@ -23,7 +23,6 @@ GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --prefix=${PREFIX} \ --without-zlib-version-check \ - --with-ssl-engine \ --with-mantype=man ETCOLD= ${PREFIX}/etc @@ -42,8 +41,8 @@ gssapi_PKGNAMESUFFIX= -portable-gssapi OPTIONS_DEFINE= DOCS PAM TCP_WRAPPERS LIBEDIT BSM \ HPN KERB_GSSAPI \ - LDNS NONECIPHER XMSS FIDO_U2F BLACKLISTD -OPTIONS_DEFAULT= LIBEDIT PAM TCP_WRAPPERS LDNS FIDO_U2F + LDNS NONECIPHER XMSS FIDO_U2F BLACKLISTD OPENSSL +OPTIONS_DEFAULT= LIBEDIT PAM TCP_WRAPPERS LDNS FIDO_U2F OPENSSL .if ${FLAVOR:U} == hpn OPTIONS_DEFAULT+= HPN NONECIPHER .endif @@ -64,6 +63,7 @@ NONECIPHER_DESC= NONE Cipher support XMSS_DESC= XMSS key support (experimental) FIDO_U2F_DESC= FIDO/U2F support (security/libfido2) BLACKLISTD_DESC= FreeBSD blacklistd(8) support +OPENSSL_DESC= Use of OpenSSL; when disabled use only limited internal crypto **EXPERIMENTAL** OPTIONS_SUB= yes @@ -94,6 +94,9 @@ FIDO_U2F_CONFIGURE_OFF= --disable-security-key BLACKLISTD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-blacklistd +OPENSSL_CONFIGURE_ON= --with-ssl-engine +OPENSSL_CONFIGURE_OFF= --without-openssl + ETCDIR?= ${PREFIX}/etc/ssh .include @@ -209,6 +212,8 @@ post-patch: ${WRKSRC}/sshd_config.5 @${ECHO_CMD} '#define SSH_VERSION_FREEBSD_PORT "${VERSION_ADDENDUM_DEFAULT}"' >> \ ${WRKSRC}/version.h + @${REINPLACE_CMD} \ + -e 's|BLACKLIST_BAD_USER|BLACKLIST_AUTH_FAIL|' ${WRKSRC}/auth.c post-configure-XMSS-on: @${ECHO_CMD} "#define WITH_XMSS 1" >> ${WRKSRC}/config.h diff --git a/security/openssh-portable/files/patch-CVE-2024-6387 b/security/openssh-portable/files/patch-CVE-2024-6387 new file mode 100644 index 000000000000..65d0fe4323a4 --- /dev/null +++ b/security/openssh-portable/files/patch-CVE-2024-6387 @@ -0,0 +1,36 @@ +From 8f80def8aa085385dc4fe4668f0e29d3a0dc8510 Mon Sep 17 00:00:00 2001 +From: Philip Paeps +Date: Mon, 1 Jul 2024 16:20:01 +0800 +Subject: 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 9fc1a2e2eaf6..436c75630181 100644 +--- log.c.orig ++++ 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/security/vuxml/vuln/2024.xml b/security/vuxml/vuln/2024.xml index 7c50552a00d0..f557f664f995 100644 --- a/security/vuxml/vuln/2024.xml +++ b/security/vuxml/vuln/2024.xml @@ -1,3 +1,29 @@ + + OpenSSH -- Race condition resulting in potential remote code execution + + + openssh-portable + 9.7_1,1 + + + + +

The OpenSSH project reports:

+
+

A race condition in sshd(8) could allow remote code execution as root on non-OpenBSD systems.

+
+ + + + CVE-2024-6387 + https://www.openssh.com/security.html + + + 2024-07-01 + 2024-07-01 + + + netatalk3 -- Multiple vulnerabilities