summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2014-05-22 14:42:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 17:53:40 +0100
commit0aad3ebc9313e9683d3a2605284c8d14a225afaa (patch)
tree7d24d8b5e244552e6cc206c91a1f64d21c426d03 /meta/recipes-connectivity/openssl/openssl
parentb066f8723aa394729b77f6ae139fde25803b9f3b (diff)
downloadpoky-0aad3ebc9313e9683d3a2605284c8d14a225afaa.tar.gz
openssl: add openssl-CVE-2010-5298.patch SRC_URI
make openssl-CVE-2010-5298.patch truely work (From OE-Core rev: eab33442480cc27a5cd00b3f46984fea74b7c0f9) Signed-off-by: Roy Li <rongqing.li@windriver.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/openssl/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/openssl-CVE-2010-5298.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-CVE-2010-5298.patch b/meta/recipes-connectivity/openssl/openssl/openssl-CVE-2010-5298.patch
new file mode 100644
index 0000000000..417a774ba2
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/openssl-CVE-2010-5298.patch
@@ -0,0 +1,24 @@
1openssl fix for CVE-2010-5298
2
3Upstream-Status: Backport
4
5Race condition in the ssl3_read_bytes function in s3_pkt.c in OpenSSL
6through 1.0.1g, when SSL_MODE_RELEASE_BUFFERS is enabled, allows remote
7attackers to inject data across sessions or cause a denial of service
8(use-after-free and parsing error) via an SSL connection in a
9multithreaded environment.
10
11http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-5298
12
13Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
14--- a/ssl/s3_pkt.c
15+++ b/ssl/s3_pkt.c
16@@ -1013,7 +1013,7 @@ start:
17 {
18 s->rstate=SSL_ST_READ_HEADER;
19 rr->off=0;
20- if (s->mode & SSL_MODE_RELEASE_BUFFERS)
21+ if (s->mode & SSL_MODE_RELEASE_BUFFERS && s->s3->rbuf.left == 0)
22 ssl3_release_read_buffer(s);
23 }
24 }