diff options
| author | Armin Kuster <akuster@mvista.com> | 2016-09-17 21:12:07 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-23 15:26:25 +0100 |
| commit | 94325689e52cd86faf732d0cc01a29d193e6abfe (patch) | |
| tree | 98406e079b7b1623e4271353af38e864cb84bacd /meta/recipes-connectivity | |
| parent | 800bd6e734837a16dfe0f2f0e6591f7a1b37a593 (diff) | |
| download | openembedded-core-94325689e52cd86faf732d0cc01a29d193e6abfe.tar.gz openembedded-core-94325689e52cd86faf732d0cc01a29d193e6abfe.tar.bz2 openembedded-core-94325689e52cd86faf732d0cc01a29d193e6abfe.zip | |
openssh: Security fix CVE-2015-8325
openssh < 7.2p2
Signed-off-by: Armin Kuster <akuster@mvista.com>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_7.1p2.bb | 1 |
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 @@ +From 85bdcd7c92fe7ff133bbc4e10a65c91810f88755 Mon Sep 17 00:00:00 2001 +From: Damien Miller <djm@mindrot.org> +Date: Wed, 13 Apr 2016 10:39:57 +1000 +Subject: [PATCH] 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 + +Upstream-Status: Backport +CVE: CVE-2015-8325 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + session.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: openssh-7.1p2/session.c +=================================================================== +--- openssh-7.1p2.orig/session.c ++++ openssh-7.1p2/session.c +@@ -1315,7 +1315,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(); 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 file://CVE-2016-6210_p2.patch \ file://CVE-2016-6210_p3.patch \ file://CVE-2016-6515.patch \ + file://CVE-2015-8325.patch \ " PAM_SRC_URI = "file://sshd" |