diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-06-09 16:51:17 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-10 17:12:20 +0100 |
commit | b4b50e52d2d421d1091184b39021b4243ddc2065 (patch) | |
tree | 9d41417f83f734955e9f58c98faf87ac994be657 /meta/recipes-connectivity | |
parent | 6101dd2b4c9cdd7b3805e3c9d899e934263561ed (diff) | |
download | poky-b4b50e52d2d421d1091184b39021b4243ddc2065.tar.gz |
openssl: use upstream fix for CVE-2014-0198
This replaces the fix for CVE-2014-0198 with one borrowed from Fedora,
which is the same as the patch which was actually applied upstream for
the issue, i.e.:
https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=b107586c0c3447ea22dba8698ebbcd81bb29d48c
(From OE-Core rev: d3d6eee3353fcce09e1d6b0181a0ea7b52b7a937)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
3 files changed, 39 insertions, 24 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-1.0.1e-cve-2014-0198.patch b/meta/recipes-connectivity/openssl/openssl/openssl-1.0.1e-cve-2014-0198.patch new file mode 100644 index 0000000000..12dcfb7f3a --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/openssl-1.0.1e-cve-2014-0198.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From: Matt Caswell <matt@openssl.org> | ||
2 | Date: Sun, 11 May 2014 23:38:37 +0000 (+0100) | ||
3 | Subject: Fixed NULL pointer dereference. See PR#3321 | ||
4 | X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=b107586 | ||
5 | |||
6 | Fixed NULL pointer dereference. See PR#3321 | ||
7 | |||
8 | Patch borrowed from Fedora | ||
9 | Upstream-Status: Backport | ||
10 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
11 | |||
12 | --- | ||
13 | |||
14 | diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c | ||
15 | index 40eb0dd..d961d12 100644 | ||
16 | --- a/ssl/s3_pkt.c | ||
17 | +++ b/ssl/s3_pkt.c | ||
18 | @@ -657,9 +657,6 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, | ||
19 | SSL3_BUFFER *wb=&(s->s3->wbuf); | ||
20 | SSL_SESSION *sess; | ||
21 | |||
22 | - if (wb->buf == NULL) | ||
23 | - if (!ssl3_setup_write_buffer(s)) | ||
24 | - return -1; | ||
25 | |||
26 | /* first check if there is a SSL3_BUFFER still being written | ||
27 | * out. This will happen with non blocking IO */ | ||
28 | @@ -675,6 +672,10 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, | ||
29 | /* if it went, fall through and send more stuff */ | ||
30 | } | ||
31 | |||
32 | + if (wb->buf == NULL) | ||
33 | + if (!ssl3_setup_write_buffer(s)) | ||
34 | + return -1; | ||
35 | + | ||
36 | if (len == 0 && !create_empty_fragment) | ||
37 | return 0; | ||
38 | |||
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 deleted file mode 100644 index 4c51d746ff..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/openssl-CVE-2014-0198-fix.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1093837 | ||
4 | |||
5 | CVE-2014-0198: An attacker can trigger generation of an SSL | ||
6 | alert which could cause a null pointer dereference. | ||
7 | |||
8 | Signed-off-by: Maxin B. John <maxin.john@enea.com> | ||
9 | --- | ||
10 | diff -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 d4fc91d851..18f0bafda1 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb | |||
@@ -34,8 +34,8 @@ 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 \ | ||
38 | file://openssl-1.0.1e-cve-2014-0195.patch \ | 37 | file://openssl-1.0.1e-cve-2014-0195.patch \ |
38 | file://openssl-1.0.1e-cve-2014-0198.patch \ | ||
39 | file://openssl-CVE-2010-5298.patch \ | 39 | file://openssl-CVE-2010-5298.patch \ |
40 | " | 40 | " |
41 | 41 | ||