summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-09-24 06:06:10 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-06 07:51:17 (GMT)
commit766c5ced756e6aa75b7ce80dd1e9ca4605384c47 (patch)
treee392566e19ab36db7db7c42c4544c8593deab0e3
parent2ff9d30dac1d0734547b0793bd5d1efb00d00f4e (diff)
downloadpoky-766c5ced756e6aa75b7ce80dd1e9ca4605384c47.tar.gz
openssl: Security fix CVE-2016-2180
affects openssl < 1.0.1i (From OE-Core rev: ed8bed3bf2d2460ff93bdaa255091e0d388a8209) 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-2180.patch44
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2h.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2016-2180.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2016-2180.patch
new file mode 100644
index 0000000..c71aaa5
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/CVE-2016-2180.patch
@@ -0,0 +1,44 @@
1From b746aa3fe05b5b5f7126df247ac3eceeb995e2a0 Mon Sep 17 00:00:00 2001
2From: "Dr. Stephen Henson" <steve@openssl.org>
3Date: Thu, 21 Jul 2016 15:24:16 +0100
4Subject: [PATCH] Fix OOB read in TS_OBJ_print_bio().
5
6TS_OBJ_print_bio() misuses OBJ_txt2obj: it should print the result
7as a null terminated buffer. The length value returned is the total
8length the complete text reprsentation would need not the amount of
9data written.
10
11CVE-2016-2180
12
13Thanks to Shi Lei for reporting this bug.
14
15Reviewed-by: Matt Caswell <matt@openssl.org>
16(cherry picked from commit 0ed26acce328ec16a3aa635f1ca37365e8c7403a)
17
18Upstream-Status: Backport
19CVE: CVE-2016-2180
20Signed-off-by: Armin Kuster <akuster@mvista.com>
21
22---
23 crypto/ts/ts_lib.c | 5 ++---
24 1 file changed, 2 insertions(+), 3 deletions(-)
25
26diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c
27index c51538a..e0f1063 100644
28--- a/crypto/ts/ts_lib.c
29+++ b/crypto/ts/ts_lib.c
30@@ -90,9 +90,8 @@ int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj)
31 {
32 char obj_txt[128];
33
34- int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0);
35- BIO_write(bio, obj_txt, len);
36- BIO_write(bio, "\n", 1);
37+ OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0);
38+ BIO_printf(bio, "%s\n", obj_txt);
39
40 return 1;
41 }
42--
432.7.4
44
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb
index 07cb0f9..764f1a2 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb
@@ -40,6 +40,7 @@ SRC_URI += "file://configure-targets.patch \
40 file://parallel.patch \ 40 file://parallel.patch \
41 file://CVE-2016-2177.patch \ 41 file://CVE-2016-2177.patch \
42 file://CVE-2016-2178.patch \ 42 file://CVE-2016-2178.patch \
43 file://CVE-2016-2180.patch \
43 " 44 "
44 45
45SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0" 46SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0"