[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 58/246] openssh: Security fix CVE-2016-5615

[Emmanuele Bassi <ebassi src gnome org>]

commit a837c6be8f722e013fdaec70ae2a88fb739dbf9c
Author: Armin Kuster <akuster mvista com>
Date:   Sat Sep 17 21:09:43 2016 -0700

    openssh: Security fix CVE-2016-5615
    
    openssh < 7.3
    
    (From OE-Core rev: 800bd6e734837a16dfe0f2f0e6591f7a1b37a593)
    
    Signed-off-by: Armin Kuster <akuster mvista com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../openssh/openssh/CVE-2016-6515.patch            |   54 ++++++++++++++++++++
 meta/recipes-connectivity/openssh/openssh_7.1p2.bb |    1 +
 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 0000000..c721902
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2016-6515.patch
@@ -0,0 +1,54 @@
+From fcd135c9df440bcd2d5870405ad3311743d78d97 Mon Sep 17 00:00:00 2001
+From: "dtucker openbsd org" <dtucker openbsd org>
+Date: Thu, 21 Jul 2016 01:39:35 +0000
+Subject: [PATCH] upstream commit
+
+Skip passwords longer than 1k in length so clients can't
+easily DoS sshd by sending very long passwords, causing it to spend CPU
+hashing them. feedback djm@, ok markus@.
+
+Brought to our attention by tomas.kuthan at oracle.com, shilei-c at
+360.cn and coredump at autistici.org
+
+Upstream-ID: d0af7d4a2190b63ba1d38eec502bc4be0be9e333
+
+Upstream-Status: Backport
+CVE: CVE-2016-6515
+Signed-off-by: Armin Kuster <akuster mvista com>
+
+---
+ auth-passwd.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/auth-passwd.c b/auth-passwd.c
+index 530b5d4..996c2cf 100644
+--- a/auth-passwd.c
++++ b/auth-passwd.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: auth-passwd.c,v 1.44 2014/07/15 15:54:14 millert Exp $ */
++/* $OpenBSD: auth-passwd.c,v 1.45 2016/07/21 01:39:35 dtucker Exp $ */
+ /*
+  * Author: Tatu Ylonen <ylo cs hut fi>
+  * Copyright (c) 1995 Tatu Ylonen <ylo cs hut fi>, Espoo, Finland
+@@ -66,6 +66,8 @@ extern login_cap_t *lc;
+ #define DAY           (24L * 60 * 60) /* 1 day in seconds */
+ #define TWO_WEEKS     (2L * 7 * DAY)  /* 2 weeks in seconds */
+ 
++#define MAX_PASSWORD_LEN      1024
++
+ void
+ disable_forwarding(void)
+ {
+@@ -87,6 +89,9 @@ auth_password(Authctxt *authctxt, const char *password)
+       static int expire_checked = 0;
+ #endif
+ 
++      if (strlen(password) > MAX_PASSWORD_LEN)
++              return 0;
++
+ #ifndef HAVE_CYGWIN
+       if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
+               ok = 0;
+-- 
+2.7.4
+
diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p2.bb 
b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb
index 6de1284..fa449ba 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 = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
            file://CVE-2016-6210.patch \
            file://CVE-2016-6210_p2.patch \
            file://CVE-2016-6210_p3.patch \
+           file://CVE-2016-6515.patch \
            "
 
 PAM_SRC_URI = "file://sshd"