diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-06-09 16:53:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-10 17:12:24 +0100 |
commit | d6f29c015404fb87889e7275a398733a906b81d1 (patch) | |
tree | d7a528025d59f066a9b7ef8774e2e2ecf336eba2 /meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-1.0.1e-cve-2014-0198.patch | |
parent | c5d81c3386b945293580ed87fcecc0c80851ef0e (diff) | |
download | poky-d6f29c015404fb87889e7275a398733a906b81d1.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: 21fa437a37dad14145b6c8c8c16c95f1b074e09c)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-1.0.1e-cve-2014-0198.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-1.0.1e-cve-2014-0198.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-1.0.1e-cve-2014-0198.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-1.0.1e-cve-2014-0198.patch new file mode 100644 index 0000000000..12dcfb7f3a --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.1e/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 | |||