diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2014-0198-fix.patch | 23 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.1e.bb | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2014-0198-fix.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2014-0198-fix.patch new file mode 100644 index 0000000000..4c51d746ff --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2014-0198-fix.patch | |||
@@ -0,0 +1,23 @@ | |||
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.1e.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb index 103cb48745..bc1b944839 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb | |||
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux" | |||
6 | 6 | ||
7 | CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" | 7 | CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" |
8 | 8 | ||
9 | PR = "${INC_PR}.1" | 9 | PR = "${INC_PR}.2" |
10 | 10 | ||
11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" | 11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" |
12 | 12 | ||
@@ -36,6 +36,7 @@ SRC_URI += "file://configure-targets.patch \ | |||
36 | file://0001-Fix-DTLS-retransmission-from-previous-session.patch \ | 36 | file://0001-Fix-DTLS-retransmission-from-previous-session.patch \ |
37 | file://0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch \ | 37 | file://0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch \ |
38 | file://CVE-2014-0160.patch \ | 38 | file://CVE-2014-0160.patch \ |
39 | file://openssl-CVE-2014-0198-fix.patch \ | ||
39 | " | 40 | " |
40 | 41 | ||
41 | SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c" | 42 | SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c" |