summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2016-11-10 15:01:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-23 11:10:12 +0000
commitdae2cfc2c4b12307f15ceaef4a3ad73eec943783 (patch)
tree0ed398493510ad2b62f6c50f2f0051639d8d04f9 /meta
parent39ebe8975ef403cc9d7d0e20dc2b4c9d3607f8f2 (diff)
downloadpoky-dae2cfc2c4b12307f15ceaef4a3ad73eec943783.tar.gz
openssh: fix CVE-2016-8858
Backport patch to fix CVE-2016-8858 of openssh. Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1384860 (From OE-Core rev: 134a05616839d002970b2e7124ea38348d10209b) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/fix-CVE-2016-8858.patch39
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.3p1.bb1
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/fix-CVE-2016-8858.patch b/meta/recipes-connectivity/openssh/openssh/fix-CVE-2016-8858.patch
new file mode 100644
index 0000000000..b26ee81b9a
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/fix-CVE-2016-8858.patch
@@ -0,0 +1,39 @@
1Fix CVE-2016-8858 of openssh
2
3Backport patch from upstream and drop the change of comment which can NOT be applied.
4
5Upstream-Status: Backport [ https://anongit.mindrot.org/openssh.git/commit/?id=ec165c3 ]
6CVE: CVE-2016-8858
7
8Signed-off-by: Kai Kang <kai.kang@windriver.com>
9---
10From ec165c392ca54317dbe3064a8c200de6531e89ad Mon Sep 17 00:00:00 2001
11From: "markus@openbsd.org" <markus@openbsd.org>
12Date: Mon, 10 Oct 2016 19:28:48 +0000
13Subject: [PATCH] upstream commit
14
15Unregister the KEXINIT handler after message has been
16received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause
17allocation of up to 128MB -- until the connection is closed. Reported by
18shilei-c at 360.cn
19
20Upstream-ID: 43649ae12a27ef94290db16d1a98294588b75c05
21---
22 kex.c | 3 ++-
23 1 file changed, 2 insertions(+), 1 deletion(-)
24
25diff --git a/kex.c b/kex.c
26index 3f97f8c..6a94bc5 100644
27--- a/kex.c
28+++ b/kex.c
29@@ -481,6 +481,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt)
30 if (kex == NULL)
31 return SSH_ERR_INVALID_ARGUMENT;
32
33+ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
34 ptr = sshpkt_ptr(ssh, &dlen);
35 if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
36 return r;
37--
382.10.1
39
diff --git a/meta/recipes-connectivity/openssh/openssh_7.3p1.bb b/meta/recipes-connectivity/openssh/openssh_7.3p1.bb
index 039b0ffdde..94eb0ed208 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.3p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.3p1.bb
@@ -25,6 +25,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
25 file://openssh-7.1p1-conditional-compile-des-in-cipher.patch \ 25 file://openssh-7.1p1-conditional-compile-des-in-cipher.patch \
26 file://openssh-7.1p1-conditional-compile-des-in-pkcs11.patch \ 26 file://openssh-7.1p1-conditional-compile-des-in-pkcs11.patch \
27 file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ 27 file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
28 file://fix-CVE-2016-8858.patch \
28 " 29 "
29 30
30PAM_SRC_URI = "file://sshd" 31PAM_SRC_URI = "file://sshd"