summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/.git-dpm4
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/CVE-2015-8325.patch33
-rw-r--r--debian/patches/series1
4 files changed, 37 insertions, 2 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 56d701e88..589d66c5c 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
1# see git-dpm(1) from git-dpm package 1# see git-dpm(1) from git-dpm package
2d888c9637031a93c13c168a35e99e9aa76c14a9a 27f3fb4e5fdddc6600e70ae663c21511fbcf2c64c
3d888c9637031a93c13c168a35e99e9aa76c14a9a 37f3fb4e5fdddc6600e70ae663c21511fbcf2c64c
4f0329aac23c61e1a5197d6d57349a63f459bccb0 4f0329aac23c61e1a5197d6d57349a63f459bccb0
5f0329aac23c61e1a5197d6d57349a63f459bccb0 5f0329aac23c61e1a5197d6d57349a63f459bccb0
6openssh_7.2p2.orig.tar.gz 6openssh_7.2p2.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 6c8010be9..261b42c15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
1openssh (1:7.2p2-3) UNRELEASED; urgency=medium 1openssh (1:7.2p2-3) UNRELEASED; urgency=medium
2 2
3 * Change all openssh.org references to openssh.com (closes: #819213). 3 * Change all openssh.org references to openssh.com (closes: #819213).
4 * CVE-2015-8325: Ignore PAM environment vars when UseLogin=yes.
4 5
5 -- Colin Watson <cjwatson@debian.org> Sun, 03 Apr 2016 18:09:59 +0100 6 -- Colin Watson <cjwatson@debian.org> Sun, 03 Apr 2016 18:09:59 +0100
6 7
diff --git a/debian/patches/CVE-2015-8325.patch b/debian/patches/CVE-2015-8325.patch
new file mode 100644
index 000000000..de2c33577
--- /dev/null
+++ b/debian/patches/CVE-2015-8325.patch
@@ -0,0 +1,33 @@
1From 7f3fb4e5fdddc6600e70ae663c21511fbcf2c64c Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org>
3Date: Wed, 13 Apr 2016 10:39:57 +1000
4Subject: 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
13Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=85bdcd7c92fe7ff133bbc4e10a65c91810f88755
14Last-Update: 2016-04-13
15
16Patch-Name: CVE-2015-8325.patch
17---
18 session.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/session.c b/session.c
22index f246b8a..8ab9814 100644
23--- a/session.c
24+++ b/session.c
25@@ -1317,7 +1317,7 @@ do_setup_env(Session *s, const char *shell)
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/debian/patches/series b/debian/patches/series
index e5821f627..b5c9fb392 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ gnome-ssh-askpass2-icon.patch
25sigstop.patch 25sigstop.patch
26systemd-readiness.patch 26systemd-readiness.patch
27debian-config.patch 27debian-config.patch
28CVE-2015-8325.patch