summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl/openssl-CVE-2014-0198-fix.patch
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2014-10-16 03:05:19 +0200
committerTudor Florea <tudor.florea@enea.com>2014-10-16 03:05:19 +0200
commitc527fd1f14c27855a37f2e8ac5346ce8d940ced2 (patch)
treebb002c1fdf011c41dbd2f0927bed23ecb5f83c97 /meta/recipes-connectivity/openssl/openssl/openssl-CVE-2014-0198-fix.patch
downloadpoky-daisy-140929.tar.gz
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/openssl-CVE-2014-0198-fix.patch')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/openssl-CVE-2014-0198-fix.patch23
1 files changed, 23 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)