From owner-svn-ports-all@freebsd.org Thu Mar 18 20:49:45 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EEC295ACE8B; Thu, 18 Mar 2021 20:49:45 +0000 (UTC) (envelope-from bdrewery@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F1fKP5TwGz4lQc; Thu, 18 Mar 2021 20:49:45 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A3167904; Thu, 18 Mar 2021 20:49:45 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12IKnjuk003889; Thu, 18 Mar 2021 20:49:45 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12IKnjwv003887; Thu, 18 Mar 2021 20:49:45 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <202103182049.12IKnjwv003887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 18 Mar 2021 20:49:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568761 - in head/security/openssh-portable: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/security/openssh-portable: . files X-SVN-Commit-Revision: 568761 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2021 20:49:46 -0000 Author: bdrewery Date: Thu Mar 18 20:49:44 2021 New Revision: 568761 URL: https://svnweb.freebsd.org/changeset/ports/568761 Log: Add limited patch for CVE-2021-28041 from upstream. Added: head/security/openssh-portable/files/patch-zz-8.4-CVE-2021-28041 (contents, props changed) Modified: head/security/openssh-portable/Makefile Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Thu Mar 18 20:17:24 2021 (r568760) +++ head/security/openssh-portable/Makefile Thu Mar 18 20:49:44 2021 (r568761) @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 8.4p1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= OPENBSD/OpenSSH/portable Added: head/security/openssh-portable/files/patch-zz-8.4-CVE-2021-28041 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openssh-portable/files/patch-zz-8.4-CVE-2021-28041 Thu Mar 18 20:49:44 2021 (r568761) @@ -0,0 +1,32 @@ +untrusted comment: verify with openbsd-68-base.pub +RWQZj25CSG5R2lgsgSLgQjjy3/BFahe7C64NJOej05Naf0mm//TKykuXL7pxOVsY5rnXH0A6vBdO5UNx7PkuTxLOACHx5xV7Gws= + +OpenBSD 6.8 errata 015, March 4, 2021: + +Double free in ssh-agent(1) + +Apply by doing: + signify -Vep /etc/signify/openbsd-68-base.pub -x 015_sshagent.patch.sig \ + -m - | (cd /usr/src && patch -p0) + +And then rebuild and install ssh (as well as ssh-agent) + cd /usr/src/usr.bin/ssh + make obj + make clean + make + make install + +Index: usr.bin/ssh/ssh-agent.c +=================================================================== +RCS file: /cvs/src/usr.bin/ssh/ssh-agent.c,v +diff -u -p -u -r1.264 ssh-agent.c +--- ssh-agent.c 18 Sep 2020 08:16:38 -0000 1.264 ++++ ssh-agent.c 3 Mar 2021 01:08:25 -0000 +@@ -567,6 +567,7 @@ process_add_identity(SocketEntry *e) + goto err; + } + free(ext_name); ++ ext_name = NULL; + break; + default: + error("%s: Unknown constraint %d", __func__, ctype);