summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-09-17 21:12:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 15:27:05 +0100
commitb6e49668742e2cbbf464e3e79bc543eb5c1673ab (patch)
tree01f8ececafea055e7a180b35bda188f41d09d6cb
parenta837c6be8f722e013fdaec70ae2a88fb739dbf9c (diff)
downloadpoky-b6e49668742e2cbbf464e3e79bc543eb5c1673ab.tar.gz
openssh: Security fix CVE-2015-8325
openssh < 7.2p2 (From OE-Core rev: 94325689e52cd86faf732d0cc01a29d193e6abfe) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch33
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.1p2.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch
new file mode 100644
index 0000000000..05e08534c9
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch
@@ -0,0 +1,33 @@
1From 85bdcd7c92fe7ff133bbc4e10a65c91810f88755 Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org>
3Date: Wed, 13 Apr 2016 10:39:57 +1000
4Subject: [PATCH] ignore PAM environment vars when UseLogin=yes
5
6If PAM is configured to read user-specified environment variables
7and UseLogin=yes in sshd_config, then a hostile local user may
8attack /bin/login via LD_PRELOAD or similar environment variables
9set via PAM.
10
11CVE-2015-8325, found by Shayan Sadigh, via Colin Watson
12
13Upstream-Status: Backport
14CVE: CVE-2015-8325
15Signed-off-by: Armin Kuster <akuster@mvista.com>
16
17---
18 session.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21Index: openssh-7.1p2/session.c
22===================================================================
23--- openssh-7.1p2.orig/session.c
24+++ openssh-7.1p2/session.c
25@@ -1315,7 +1315,7 @@ do_setup_env(Session *s, const char *she
26 * Pull in any environment variables that may have
27 * been set by PAM.
28 */
29- if (options.use_pam) {
30+ if (options.use_pam && !options.use_login) {
31 char **p;
32
33 p = fetch_pam_child_environment();
diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
index fa449ba8ae..10b78c5bfb 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
@@ -29,6 +29,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
29 file://CVE-2016-6210_p2.patch \ 29 file://CVE-2016-6210_p2.patch \
30 file://CVE-2016-6210_p3.patch \ 30 file://CVE-2016-6210_p3.patch \
31 file://CVE-2016-6515.patch \ 31 file://CVE-2016-6515.patch \
32 file://CVE-2015-8325.patch \
32 " 33 "
33 34
34PAM_SRC_URI = "file://sshd" 35PAM_SRC_URI = "file://sshd"