summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-09-24 06:14:36 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-06 07:51:17 (GMT)
commitd23b450ea3090cb10a98faa7463508ca6ab24744 (patch)
tree9020af95864c1fd7433ebd990b7483b7e3148a63
parent91353b6936666bcdde5ef022760f5ed8aebe7ef5 (diff)
downloadpoky-d23b450ea3090cb10a98faa7463508ca6ab24744.tar.gz
openssl: Security fix CVE-2016-6303
affects openssl < 1.0.1i (From OE-Core rev: df7e4fdba42e9fcb799e812f6706bd56967858d9) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/CVE-2016-6303.patch36
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2h.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2016-6303.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2016-6303.patch
new file mode 100644
index 0000000..95bdec4
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/CVE-2016-6303.patch
@@ -0,0 +1,36 @@
1From 1027ad4f34c30b8585592764b9a670ba36888269 Mon Sep 17 00:00:00 2001
2From: "Dr. Stephen Henson" <steve@openssl.org>
3Date: Fri, 19 Aug 2016 23:28:29 +0100
4Subject: [PATCH] Avoid overflow in MDC2_Update()
5
6Thanks to Shi Lei for reporting this issue.
7
8CVE-2016-6303
9
10Reviewed-by: Matt Caswell <matt@openssl.org>
11(cherry picked from commit 55d83bf7c10c7b205fffa23fa7c3977491e56c07)
12
13Upstream-Status: Backport
14CVE: CVE-2016-6303
15Signed-off-by: Armin Kuster <akuster@mvista.com>
16
17---
18 crypto/mdc2/mdc2dgst.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/crypto/mdc2/mdc2dgst.c b/crypto/mdc2/mdc2dgst.c
22index 6615cf8..2dce493 100644
23--- a/crypto/mdc2/mdc2dgst.c
24+++ b/crypto/mdc2/mdc2dgst.c
25@@ -91,7 +91,7 @@ int MDC2_Update(MDC2_CTX *c, const unsigned char *in, size_t len)
26
27 i = c->num;
28 if (i != 0) {
29- if (i + len < MDC2_BLOCK) {
30+ if (len < MDC2_BLOCK - i) {
31 /* partial block */
32 memcpy(&(c->data[i]), in, len);
33 c->num += (int)len;
34--
352.7.4
36
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb
index c1bced0..436b37c 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb
@@ -46,6 +46,7 @@ SRC_URI += "file://configure-targets.patch \
46 file://CVE-2016-2181_p3.patch \ 46 file://CVE-2016-2181_p3.patch \
47 file://CVE-2016-2182.patch \ 47 file://CVE-2016-2182.patch \
48 file://CVE-2016-6302.patch \ 48 file://CVE-2016-6302.patch \
49 file://CVE-2016-6303.patch \
49 " 50 "
50 51
51SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0" 52SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0"