diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-18 15:11:56 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-19 08:39:26 +0100 |
| commit | 0a06be81cb650def54a4c2059bd728c75954306f (patch) | |
| tree | 0eee1c16380f5a2ff49cf6f2c456a96a00608b7e /meta/recipes-connectivity | |
| parent | 5e24780ac0fea9012f28f6e3f1040c431d3a742e (diff) | |
| download | openembedded-core-0a06be81cb650def54a4c2059bd728c75954306f.tar.gz openembedded-core-0a06be81cb650def54a4c2059bd728c75954306f.tar.bz2 openembedded-core-0a06be81cb650def54a4c2059bd728c75954306f.zip | |
openssh: Backport fix for CVE-2015-8325
PAM environment vars must be ignored when UseLogin=yes
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_7.2p2.bb | 1 |
2 files changed, 40 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..226389718d --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/CVE-2015-8325.patch @@ -0,0 +1,39 @@ +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: 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 + + + +https://anongit.mindrot.org/openssh.git/commit/session.c?id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755 + +CVE: CVE-2015-8325 +Upstream-Status: Backport +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + 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/meta/recipes-connectivity/openssh/openssh_7.2p2.bb b/meta/recipes-connectivity/openssh/openssh_7.2p2.bb index 173f80a2af..7e047168dc 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.2p2.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.2p2.bb @@ -21,6 +21,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar file://volatiles.99_sshd \ file://add-test-support-for-busybox.patch \ file://run-ptest \ + file://CVE-2015-8325.patch \ " PAM_SRC_URI = "file://sshd" |