summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9224.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/ruby-CVE-2017-9224.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/ruby-CVE-2017-9224.patch')
-rw-r--r--meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9224.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9224.patch b/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9224.patch
new file mode 100644
index 0000000000..848139b7e3
--- /dev/null
+++ b/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9224.patch
@@ -0,0 +1,41 @@
1From 690313a061f7a4fa614ec5cc8368b4f2284e059b Mon Sep 17 00:00:00 2001
2From: "K.Kosako" <kosako@sofnec.co.jp>
3Date: Tue, 23 May 2017 10:28:58 +0900
4Subject: [PATCH] fix #57 : DATA_ENSURE() check must be before data access
5
6---
7 regexec.c | 5 -----
8 1 file changed, 5 deletions(-)
9
10--- end of original header
11
12CVE: CVE-2017-9224
13
14Context modified so that patch applies for version 2.4.1.
15
16Upstream-Status: Pending
17Signed-off-by: Joe Slater <joe.slater@windriver.com>
18
19
20diff --git a/regexec.c b/regexec.c
21index 35fef11..d4e577d 100644
22--- a/regexec.c
23+++ b/regexec.c
24@@ -1473,14 +1473,9 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
25 NEXT;
26
27 CASE(OP_EXACT1) MOP_IN(OP_EXACT1);
28-#if 0
29 DATA_ENSURE(1);
30 if (*p != *s) goto fail;
31 p++; s++;
32-#endif
33- if (*p != *s++) goto fail;
34- DATA_ENSURE(0);
35- p++;
36 MOP_OUT;
37 break;
38
39--
401.7.9.5
41