diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-01-12 18:20:01 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-14 22:10:54 +0000 |
commit | bbc0795ada93d943bf534289eaa7c07c5ffb7d44 (patch) | |
tree | a4799babf05503dd1ae12dbedb76725c7c82ff08 /meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch | |
parent | e6aadcc2a04ae4e85b1cb00c5c9ce1c0f76ee871 (diff) | |
download | poky-bbc0795ada93d943bf534289eaa7c07c5ffb7d44.tar.gz |
ruby: update to 2.4.0
Existing version of ruby-native (2.2.5) was crashing on my machine (and others' too),
yet a functional ruby is necessary to upgrade webkit to a version that less vulnerable
to Spectre.
I've performed the update by copying the ruby recipe directory over from the current
pyro tree; if you want to see the list of specific commits, issue this command:
git log 99656fecf4fa6e24ba49ecb7f26f893e733818a0 meta/recipes-devtools/ruby
(up to commit e593d3aeb2ea5f08d6e0753133fe89e345b339e8)
(From OE-Core rev: 4734a4b41898e3df252b6234ed1270a915fd1f68)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch')
-rw-r--r-- | meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch b/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch new file mode 100644 index 0000000000..d8bfba486c --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 3b63d12038c8d8fc278e81c942fa9bec7c704c8b Mon Sep 17 00:00:00 2001 | ||
2 | From: "K.Kosako" <kosako@sofnec.co.jp> | ||
3 | Date: Wed, 24 May 2017 13:43:25 +0900 | ||
4 | Subject: [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 | |||
12 | CVE: CVE-2017-9228 | ||
13 | |||
14 | Upstream-Status: Inappropriate [not author] | ||
15 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
16 | |||
17 | diff --git a/regparse.c b/regparse.c | ||
18 | index 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 | -- | ||
33 | 1.7.9.5 | ||
34 | |||