From 0aad3ebc9313e9683d3a2605284c8d14a225afaa Mon Sep 17 00:00:00 2001 From: Roy Li Date: Thu, 22 May 2014 14:42:51 +0800 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../openssl-1.0.1e/openssl-CVE-2010-5298.patch | 24 ---------------------- .../openssl/openssl/openssl-CVE-2010-5298.patch | 24 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.0.1g.bb | 1 + 3 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2010-5298.patch create mode 100644 meta/recipes-connectivity/openssl/openssl/openssl-CVE-2010-5298.patch 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 deleted file mode 100644 index 417a774ba2..0000000000 --- a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2010-5298.patch +++ /dev/null @@ -1,24 +0,0 @@ -openssl fix for CVE-2010-5298 - -Upstream-Status: Backport - -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 - -Signed-off-by: Yue Tao ---- a/ssl/s3_pkt.c -+++ b/ssl/s3_pkt.c -@@ -1013,7 +1013,7 @@ start: - { - s->rstate=SSL_ST_READ_HEADER; - rr->off=0; -- if (s->mode & SSL_MODE_RELEASE_BUFFERS) -+ if (s->mode & SSL_MODE_RELEASE_BUFFERS && s->s3->rbuf.left == 0) - ssl3_release_read_buffer(s); - } - } 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 @@ +openssl fix for CVE-2010-5298 + +Upstream-Status: Backport + +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 + +Signed-off-by: Yue Tao +--- a/ssl/s3_pkt.c ++++ b/ssl/s3_pkt.c +@@ -1013,7 +1013,7 @@ start: + { + s->rstate=SSL_ST_READ_HEADER; + rr->off=0; +- if (s->mode & SSL_MODE_RELEASE_BUFFERS) ++ if (s->mode & SSL_MODE_RELEASE_BUFFERS && s->s3->rbuf.left == 0) + ssl3_release_read_buffer(s); + } + } diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb index 7c44546cbe..bbf1455f7d 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1g.bb @@ -37,6 +37,7 @@ SRC_URI += "file://configure-targets.patch \ file://openssl-CVE-2014-0198-fix.patch \ file://Makefiles-ptest.patch \ file://run-ptest \ + file://openssl-CVE-2010-5298.patch \ " SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959" -- cgit v1.2.3-54-g00ecf