diff options
author | Yue Tao <Yue.Tao@windriver.com> | 2014-06-09 16:53:48 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-10 17:12:24 +0100 |
commit | 381c6b89574df10411fa28a593a5c02cd169bf46 (patch) | |
tree | db2e578a0aef89caaeb87ac2db9cd958f54f67ee /meta | |
parent | 8ac53f3c2d0c20409aee7161ce6b548221e43709 (diff) | |
download | poky-381c6b89574df10411fa28a593a5c02cd169bf46.tar.gz |
openssl: fix for CVE-2010-5298
Race condition in the ssl3_read_bytes function in s3_pkt.c in OpenSSL
through 1.0.1g, when SSL_MODE_RELEASE_BUFFERS is enabled, allows remote
attackers to inject data across sessions or cause a denial of service
(use-after-free and parsing error) via an SSL connection in a
multithreaded environment.
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-5298
(From OE-Core master rev: 751f81ed8dc488c500837aeb3eb41ebf3237e10b)
(From OE-Core rev: 3cc799213e6528fc9fb4a0c40a01a1817484f499)
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
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>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2010-5298.patch | 24 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.1e.bb | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2010-5298.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2010-5298.patch new file mode 100644 index 0000000000..417a774ba2 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2010-5298.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | openssl fix for CVE-2010-5298 | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | |||
5 | Race condition in the ssl3_read_bytes function in s3_pkt.c in OpenSSL | ||
6 | through 1.0.1g, when SSL_MODE_RELEASE_BUFFERS is enabled, allows remote | ||
7 | attackers to inject data across sessions or cause a denial of service | ||
8 | (use-after-free and parsing error) via an SSL connection in a | ||
9 | multithreaded environment. | ||
10 | |||
11 | http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-5298 | ||
12 | |||
13 | Signed-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 | } | ||
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb index 65083fb8bf..d639d0a6ad 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb | |||
@@ -43,6 +43,7 @@ SRC_URI += "file://configure-targets.patch \ | |||
43 | file://openssl-1.0.1e-cve-2014-0221.patch \ | 43 | file://openssl-1.0.1e-cve-2014-0221.patch \ |
44 | file://openssl-1.0.1e-cve-2014-0224.patch \ | 44 | file://openssl-1.0.1e-cve-2014-0224.patch \ |
45 | file://openssl-1.0.1e-cve-2014-3470.patch \ | 45 | file://openssl-1.0.1e-cve-2014-3470.patch \ |
46 | file://openssl-CVE-2010-5298.patch \ | ||
46 | " | 47 | " |
47 | 48 | ||
48 | SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c" | 49 | SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c" |