From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 1/1] gnu: openssh: Fix CVE-2015-8325. Date: Fri, 15 Apr 2016 14:22:55 -0400 Message-ID: <7eee4d808f7cc2b35eb7ae45c86079ba68a9e55d.1460744429.git.leo@famulari.name> References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar8OB-0002v2-9K for guix-devel@gnu.org; Fri, 15 Apr 2016 14:22:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ar8O7-00006z-9j for guix-devel@gnu.org; Fri, 15 Apr 2016 14:22:43 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:46476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar8O7-00005u-5z for guix-devel@gnu.org; Fri, 15 Apr 2016 14:22:39 -0400 Received: from jasmine.fios-router.home (static-98-115-19-163.phlapa.fios.verizon.net [98.115.19.163]) by mail.messagingengine.com (Postfix) with ESMTPA id 8A6446802AA for ; Fri, 15 Apr 2016 14:22:37 -0400 (EDT) In-Reply-To: In-Reply-To: References: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/patches/openssh-CVE-2015-8325.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/ssh.scm (openssh): Use it. --- gnu-system.am | 1 + gnu/packages/patches/openssh-CVE-2015-8325.patch | 31 ++++++++++++++++++++++++ gnu/packages/ssh.scm | 3 ++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openssh-CVE-2015-8325.patch diff --git a/gnu-system.am b/gnu-system.am index cd1c663..273e9df 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -631,6 +631,7 @@ dist_patch_DATA = \ gnu/packages/patches/openimageio-boost-1.60.patch \ gnu/packages/patches/openjpeg-CVE-2015-6581.patch \ gnu/packages/patches/openjpeg-use-after-free-fix.patch \ + gnu/packages/patches/openssh-CVE-2015-8325.patch \ gnu/packages/patches/openssl-runpath.patch \ gnu/packages/patches/openssl-c-rehash-in.patch \ gnu/packages/patches/orpheus-cast-errors-and-includes.patch \ diff --git a/gnu/packages/patches/openssh-CVE-2015-8325.patch b/gnu/packages/patches/openssh-CVE-2015-8325.patch new file mode 100644 index 0000000..8063e64 --- /dev/null +++ b/gnu/packages/patches/openssh-CVE-2015-8325.patch @@ -0,0 +1,31 @@ +From 85bdcd7c92fe7ff133bbc4e10a65c91810f88755 Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Wed, 13 Apr 2016 10:39:57 +1000 +Subject: ignore PAM environment vars when UseLogin=yes + +If PAM is configured to read user-specified environment variables +and UseLogin=yes in sshd_config, then a hostile local user may +attack /bin/login via LD_PRELOAD or similar environment variables +set via PAM. + +CVE-2015-8325, found by Shayan Sadigh, via Colin Watson +--- + session.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/session.c b/session.c +index 4859245..4653b09 100644 +--- a/session.c ++++ b/session.c +@@ -1322,7 +1322,7 @@ do_setup_env(Session *s, const char *shell) + * Pull in any environment variables that may have + * been set by PAM. + */ +- if (options.use_pam) { ++ if (options.use_pam && !options.use_login) { + char **p; + + p = fetch_pam_child_environment(); +-- +cgit v0.11.2 + diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index eaf57ac..b8f107b 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -126,7 +126,8 @@ a server that supports the SSH-2 protocol.") (string-append "http://ftp2.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/" tail)))) (sha256 (base32 - "132lh9aanb0wkisji1d6cmsxi520m8nh7c7i9wi6m1s3l38q29x7")))) + "132lh9aanb0wkisji1d6cmsxi520m8nh7c7i9wi6m1s3l38q29x7")) + (patches (search-patches "openssh-CVE-2015-8325.patch")))) (build-system gnu-build-system) (inputs `(("groff" ,groff) ("openssl" ,openssl) -- 2.7.3