summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-10-01 10:54:49 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-02 10:09:48 +0100
commit42627175955260a26db549db5ec5813c2339aa99 (patch)
treeb9efd00c1f43a1eb6243b6c053c8108b1fa57ae1 /meta/recipes-devtools
parent6e3d16b565b504765577f8442650a268c3fe7c57 (diff)
downloadpoky-42627175955260a26db549db5ec5813c2339aa99.tar.gz
ruby: drop long-merged CVE patches
The CVE patches here address the original problem in a different way to how upstream solved it, and are superfluous. Ruby updated to Onigmo v6.1.3+669ac999761 before its v2.5.0 release, and both CVEs were fixed before Onigmo v6.1.3: https://github.com/k-takata/Onigmo/releases/tag/Onigmo-6.1.3 https://github.com/k-takata/Onigmo/commits/Onigmo-6.1.3 https://github.com/k-takata/Onigmo/commit/40945546578004bf40e6f884834bcad4054c70f7 https://github.com/k-takata/Onigmo/commit/783b7ef491e1422e4be7407ccc3e4305e5013507 Because the issues were fixed differently here and in Ruby (Onigmo), patch never complained about duplicatation during recipe updates. (From OE-Core rev: 90dbe9019c81e25923ed450df80b4401d16287b4) Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9226.patch32
-rw-r--r--meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch34
-rw-r--r--meta/recipes-devtools/ruby/ruby_2.5.5.bb2
3 files changed, 0 insertions, 68 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9226.patch b/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9226.patch
deleted file mode 100644
index 89437bba74..0000000000
--- a/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9226.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From b4bf968ad52afe14e60a2dc8a95d3555c543353a Mon Sep 17 00:00:00 2001
2From: "K.Kosako" <kosako@sofnec.co.jp>
3Date: Thu, 18 May 2017 17:05:27 +0900
4Subject: [PATCH] fix #55 : check too big code point value for single byte
5 value in next_state_val()
6
7---
8 regparse.c | 3 +++
9 1 file changed, 3 insertions(+)
10
11--- end of original header
12
13CVE: CVE-2017-9226
14
15Add check for octal number bigger than 255.
16
17Upstream-Status: Pending
18Signed-off-by: Joe Slater <joe.slater@windriver.com>
19
20
21--- ruby-2.4.1.orig/regparse.c
22+++ ruby-2.4.1/regparse.c
23@@ -4450,6 +4450,9 @@ next_state_val(CClassNode* cc, CClassNod
24 switch (*state) {
25 case CCS_VALUE:
26 if (*type == CCV_SB) {
27+ if (*from > 0xff)
28+ return ONIGERR_INVALID_CODE_POINT_VALUE;
29+
30 BITSET_SET_BIT_CHKDUP(cc->bs, (int )(*from));
31 if (IS_NOT_NULL(asc_cc))
32 BITSET_SET_BIT(asc_cc->bs, (int )(*from));
diff --git a/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch b/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch
deleted file mode 100644
index d8bfba486c..0000000000
--- a/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 3b63d12038c8d8fc278e81c942fa9bec7c704c8b Mon Sep 17 00:00:00 2001
2From: "K.Kosako" <kosako@sofnec.co.jp>
3Date: Wed, 24 May 2017 13:43:25 +0900
4Subject: [PATCH] fix #60 : invalid state(CCS_VALUE) in parse_char_class()
5
6---
7 regparse.c | 4 +++-
8 1 file changed, 3 insertions(+), 1 deletion(-)
9
10--- end of original header
11
12CVE: CVE-2017-9228
13
14Upstream-Status: Inappropriate [not author]
15Signed-off-by: Joe Slater <joe.slater@windriver.com>
16
17diff --git a/regparse.c b/regparse.c
18index 69875fa..1988747 100644
19--- a/regparse.c
20+++ b/regparse.c
21@@ -4081,7 +4081,9 @@ next_state_class(CClassNode* cc, OnigCodePoint* vs, enum CCVALTYPE* type,
22 }
23 }
24
25- *state = CCS_VALUE;
26+ if (*state != CCS_START)
27+ *state = CCS_VALUE;
28+
29 *type = CCV_CLASS;
30 return 0;
31 }
32--
331.7.9.5
34
diff --git a/meta/recipes-devtools/ruby/ruby_2.5.5.bb b/meta/recipes-devtools/ruby/ruby_2.5.5.bb
index 8ad59a7657..4082b02f14 100644
--- a/meta/recipes-devtools/ruby/ruby_2.5.5.bb
+++ b/meta/recipes-devtools/ruby/ruby_2.5.5.bb
@@ -1,8 +1,6 @@
1require ruby.inc 1require ruby.inc
2 2
3SRC_URI += " \ 3SRC_URI += " \
4 file://ruby-CVE-2017-9226.patch \
5 file://ruby-CVE-2017-9228.patch \
6 file://run-ptest \ 4 file://run-ptest \
7 " 5 "
8 6