summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@enea.com>2014-05-06 02:53:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:21 +0100
commit3d95a1cce56f38be75e9888a480c31e44ac7ec2f (patch)
tree877c03080b3ca0f57f1458b4f5360c6ea3a7a7ba
parent361ddb10de4d5e27597e60ac66e7277f2fe3cd8e (diff)
downloadpoky-3d95a1cce56f38be75e9888a480c31e44ac7ec2f.tar.gz
openssl: fix CVE-2014-0198
A null pointer dereference bug was discovered in do_ssl3_write(). An attacker could possibly use this to cause OpenSSL to crash, resulting in a denial of service. https://access.redhat.com/security/cve/CVE-2014-0198 (From OE-Core rev: 580033721abbbb4302bc803ebc70c90e331e4587) (From OE-Core rev: c3f6cea0b8f1de1e2042087c26ebe42ff909c1ed) Signed-off-by: Maxin B. John <maxin.john@enea.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/openssl-CVE-2014-0198-fix.patch23
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.1g.bb1
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-CVE-2014-0198-fix.patch b/meta/recipes-connectivity/openssl/openssl/openssl-CVE-2014-0198-fix.patch
new file mode 100644
index 0000000000..4c51d746ff
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/openssl-CVE-2014-0198-fix.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Backport
2
3Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1093837
4
5CVE-2014-0198: An attacker can trigger generation of an SSL
6alert which could cause a null pointer dereference.
7
8Signed-off-by: Maxin B. John <maxin.john@enea.com>
9---
10diff -Naur openssl-1.0.1g-orig/ssl/s3_pkt.c openssl-1.0.1g/ssl/s3_pkt.c
11--- openssl-1.0.1g-orig/ssl/s3_pkt.c 2014-03-17 17:14:20.000000000 +0100
12+++ openssl-1.0.1g/ssl/s3_pkt.c 2014-05-06 02:32:43.862587660 +0200
13@@ -657,6 +657,10 @@
14 if (i <= 0)
15 return(i);
16 /* if it went, fall through and send more stuff */
17+ /* we may have released our buffer, so get it again */
18+ if (wb->buf == NULL)
19+ if (!ssl3_setup_write_buffer(s))
20+ return -1;
21 }
22
23 if (len == 0 && !create_empty_fragment)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb
index f3c20e8c97..d5f9660c38 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb
@@ -34,6 +34,7 @@ SRC_URI += "file://configure-targets.patch \
34 file://initial-aarch64-bits.patch \ 34 file://initial-aarch64-bits.patch \
35 file://find.pl \ 35 file://find.pl \
36 file://openssl-fix-des.pod-error.patch \ 36 file://openssl-fix-des.pod-error.patch \
37 file://openssl-CVE-2014-0198-fix.patch \
37 " 38 "
38 39
39SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959" 40SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959"