From 5f97311702afa5b942f0c3f71cf74292b6eae365 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Fri, 23 Sep 2016 23:14:36 -0700 Subject: openssl: Security fix CVE-2016-6303 affects openssl < 1.0.1i (From OE-Core rev: bb812836c2c8d89da54d905b65487a9f1acd5f3c) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- .../openssl/openssl/CVE-2016-6303.patch | 36 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.0.2h.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2016-6303.patch 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 0000000000..95bdec42f8 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/CVE-2016-6303.patch @@ -0,0 +1,36 @@ +From 1027ad4f34c30b8585592764b9a670ba36888269 Mon Sep 17 00:00:00 2001 +From: "Dr. Stephen Henson" +Date: Fri, 19 Aug 2016 23:28:29 +0100 +Subject: [PATCH] Avoid overflow in MDC2_Update() + +Thanks to Shi Lei for reporting this issue. + +CVE-2016-6303 + +Reviewed-by: Matt Caswell +(cherry picked from commit 55d83bf7c10c7b205fffa23fa7c3977491e56c07) + +Upstream-Status: Backport +CVE: CVE-2016-6303 +Signed-off-by: Armin Kuster + +--- + crypto/mdc2/mdc2dgst.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/mdc2/mdc2dgst.c b/crypto/mdc2/mdc2dgst.c +index 6615cf8..2dce493 100644 +--- a/crypto/mdc2/mdc2dgst.c ++++ b/crypto/mdc2/mdc2dgst.c +@@ -91,7 +91,7 @@ int MDC2_Update(MDC2_CTX *c, const unsigned char *in, size_t len) + + i = c->num; + if (i != 0) { +- if (i + len < MDC2_BLOCK) { ++ if (len < MDC2_BLOCK - i) { + /* partial block */ + memcpy(&(c->data[i]), in, len); + c->num += (int)len; +-- +2.7.4 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb index 8587f10a07..2e42e173a2 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://find.pl;subdir=${BP}/util/ \ file://CVE-2016-2181_p3.patch \ file://CVE-2016-2182.patch \ file://CVE-2016-6302.patch \ + file://CVE-2016-6303.patch \ " SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0" SRC_URI[sha256sum] = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919" -- cgit v1.2.3-54-g00ecf