summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/ruby/ruby/CVE-2017-9229.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-01-12 18:20:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-14 22:10:54 +0000
commitbbc0795ada93d943bf534289eaa7c07c5ffb7d44 (patch)
treea4799babf05503dd1ae12dbedb76725c7c82ff08 /meta/recipes-devtools/ruby/ruby/CVE-2017-9229.patch
parente6aadcc2a04ae4e85b1cb00c5c9ce1c0f76ee871 (diff)
downloadpoky-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/CVE-2017-9229.patch')
-rw-r--r--meta/recipes-devtools/ruby/ruby/CVE-2017-9229.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2017-9229.patch b/meta/recipes-devtools/ruby/ruby/CVE-2017-9229.patch
deleted file mode 100644
index 75bdfada57..0000000000
--- a/meta/recipes-devtools/ruby/ruby/CVE-2017-9229.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1commit b690371bbf97794b4a1d3f295d4fb9a8b05d402d
2Author: K.Kosako <kosako@sofnec.co.jp>
3Date: Wed May 24 10:27:04 2017 +0900
4
5 fix #59 : access to invalid address by reg->dmax value
6
7Upstream-Status: Backport
8
9CVE: CVE-2017-9229
10Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com>
11
12Index: ruby-2.2.5/regexec.c
13===================================================================
14--- ruby-2.2.5.orig/regexec.c 2017-09-13 12:17:08.429254209 +0530
15+++ ruby-2.2.5/regexec.c 2017-09-13 12:24:03.365312311 +0530
16@@ -3763,6 +3763,12 @@
17 }
18 else {
19 if (reg->dmax != ONIG_INFINITE_DISTANCE) {
20+ if (p - str < reg->dmax) {
21+ *low = (UChar* )str;
22+ if (low_prev)
23+ *low_prev = onigenc_get_prev_char_head(reg->enc, str, *low, end);
24+ }
25+ else {
26 *low = p - reg->dmax;
27 if (*low > s) {
28 *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s,
29@@ -3776,6 +3782,7 @@
30 *low_prev = onigenc_get_prev_char_head(reg->enc,
31 (pprev ? pprev : str), *low, end);
32 }
33+ }
34 }
35 }
36 /* no needs to adjust *high, *high is used as range check only */