summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-09-17 21:09:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 23:22:03 +0100
commit2622059ca09c24900bb4c88653a9717df31482e9 (patch)
tree6ce502a460337b75f8021ffb175e2c64b6407370
parentddb1db9ef7c9c2459c02c6f28fb4a1fda459bd2f (diff)
downloadpoky-2622059ca09c24900bb4c88653a9717df31482e9.tar.gz
openssh: Security fix CVE-2016-5615
openssh < 7.3 (From OE-Core rev: 3fdad451afcc16b1fa94024310b4d26333ca7de9) 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-2016-6515.patch54
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.1p2.bb1
2 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2016-6515.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2016-6515.patch
new file mode 100644
index 0000000000..c721902595
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2016-6515.patch
@@ -0,0 +1,54 @@
1From fcd135c9df440bcd2d5870405ad3311743d78d97 Mon Sep 17 00:00:00 2001
2From: "dtucker@openbsd.org" <dtucker@openbsd.org>
3Date: Thu, 21 Jul 2016 01:39:35 +0000
4Subject: [PATCH] upstream commit
5
6Skip passwords longer than 1k in length so clients can't
7easily DoS sshd by sending very long passwords, causing it to spend CPU
8hashing them. feedback djm@, ok markus@.
9
10Brought to our attention by tomas.kuthan at oracle.com, shilei-c at
11360.cn and coredump at autistici.org
12
13Upstream-ID: d0af7d4a2190b63ba1d38eec502bc4be0be9e333
14
15Upstream-Status: Backport
16CVE: CVE-2016-6515
17Signed-off-by: Armin Kuster <akuster@mvista.com>
18
19---
20 auth-passwd.c | 7 ++++++-
21 1 file changed, 6 insertions(+), 1 deletion(-)
22
23diff --git a/auth-passwd.c b/auth-passwd.c
24index 530b5d4..996c2cf 100644
25--- a/auth-passwd.c
26+++ b/auth-passwd.c
27@@ -1,4 +1,4 @@
28-/* $OpenBSD: auth-passwd.c,v 1.44 2014/07/15 15:54:14 millert Exp $ */
29+/* $OpenBSD: auth-passwd.c,v 1.45 2016/07/21 01:39:35 dtucker Exp $ */
30 /*
31 * Author: Tatu Ylonen <ylo@cs.hut.fi>
32 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
33@@ -66,6 +66,8 @@ extern login_cap_t *lc;
34 #define DAY (24L * 60 * 60) /* 1 day in seconds */
35 #define TWO_WEEKS (2L * 7 * DAY) /* 2 weeks in seconds */
36
37+#define MAX_PASSWORD_LEN 1024
38+
39 void
40 disable_forwarding(void)
41 {
42@@ -87,6 +89,9 @@ auth_password(Authctxt *authctxt, const char *password)
43 static int expire_checked = 0;
44 #endif
45
46+ if (strlen(password) > MAX_PASSWORD_LEN)
47+ return 0;
48+
49 #ifndef HAVE_CYGWIN
50 if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
51 ok = 0;
52--
532.7.4
54
diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
index bd047b0773..51c82c74a3 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
@@ -28,6 +28,7 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
28 file://CVE-2016-6210.patch \ 28 file://CVE-2016-6210.patch \
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 " 32 "
32 33
33PAM_SRC_URI = "file://sshd" 34PAM_SRC_URI = "file://sshd"