Module Name: src Committed By: snj Date: Tue May 17 18:50:35 UTC 2016
Modified Files: src/crypto/external/bsd/openssh/dist [netbsd-7]: session.c Log Message: Pull up following revision(s) (requested by christos in ticket #1168): crypto/external/bsd/openssh/dist/session.c: revision 1.19 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 https://anongit.mindrot.org/openssh.git/commit/?id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755 XXX: pullup-7 To generate a diff of this commit: cvs rdiff -u -r1.12.4.1 -r1.12.4.2 \ src/crypto/external/bsd/openssh/dist/session.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/openssh/dist/session.c diff -u src/crypto/external/bsd/openssh/dist/session.c:1.12.4.1 src/crypto/external/bsd/openssh/dist/session.c:1.12.4.2 --- src/crypto/external/bsd/openssh/dist/session.c:1.12.4.1 Thu Apr 30 06:07:30 2015 +++ src/crypto/external/bsd/openssh/dist/session.c Tue May 17 18:50:34 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: session.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $ */ +/* $NetBSD: session.c,v 1.12.4.2 2016/05/17 18:50:34 snj Exp $ */ /* $OpenBSD: session.c,v 1.277 2015/01/16 06:40:12 deraadt Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <y...@cs.hut.fi>, Espoo, Finland @@ -35,7 +35,7 @@ */ #include "includes.h" -__RCSID("$NetBSD: session.c,v 1.12.4.1 2015/04/30 06:07:30 riz Exp $"); +__RCSID("$NetBSD: session.c,v 1.12.4.2 2016/05/17 18:50:34 snj Exp $"); #include <sys/types.h> #include <sys/wait.h> #include <sys/un.h> @@ -1223,7 +1223,7 @@ do_setup_env(Session *s, const char *she * 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();