diff options
-rw-r--r-- | meta/recipes-devtools/ruby/ruby/CVE-2017-9228.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/ruby/ruby_2.2.5.bb | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2017-9228.patch b/meta/recipes-devtools/ruby/ruby/CVE-2017-9228.patch new file mode 100644 index 0000000000..dc911bb20b --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/CVE-2017-9228.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | commit 3b63d12038c8d8fc278e81c942fa9bec7c704c8b | ||
2 | Author: K.Kosako <kosako@sofnec.co.jp> | ||
3 | Date: Wed May 24 13:43:25 2017 +0900 | ||
4 | |||
5 | fix #60 : invalid state(CCS_VALUE) in parse_char_class() | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | |||
9 | CVE: CVE-2017-9228 | ||
10 | Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com> | ||
11 | |||
12 | Index: ruby-2.2.5/regparse.c | ||
13 | =================================================================== | ||
14 | --- ruby-2.2.5.orig/regparse.c 2014-09-16 08:14:10.000000000 +0530 | ||
15 | +++ ruby-2.2.5/regparse.c 2017-08-30 11:58:25.774275722 +0530 | ||
16 | @@ -4458,7 +4458,9 @@ | ||
17 | } | ||
18 | } | ||
19 | |||
20 | - *state = CCS_VALUE; | ||
21 | + if (*state != CCS_START) | ||
22 | + *state = CCS_VALUE; | ||
23 | + | ||
24 | *type = CCV_CLASS; | ||
25 | return 0; | ||
26 | } | ||
diff --git a/meta/recipes-devtools/ruby/ruby_2.2.5.bb b/meta/recipes-devtools/ruby/ruby_2.2.5.bb index e29eb9c9b4..bdb2121eff 100644 --- a/meta/recipes-devtools/ruby/ruby_2.2.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.2.5.bb | |||
@@ -6,6 +6,7 @@ SRC_URI[sha256sum] = "30c4b31697a4ca4ea0c8db8ad30cf45e6690a0f09687e5d483c933c03c | |||
6 | SRC_URI += "file://prevent-gc.patch \ | 6 | SRC_URI += "file://prevent-gc.patch \ |
7 | file://CVE-2016-7798.patch \ | 7 | file://CVE-2016-7798.patch \ |
8 | file://CVE-2017-9227.patch \ | 8 | file://CVE-2017-9227.patch \ |
9 | file://CVE-2017-9228.patch \ | ||
9 | " | 10 | " |
10 | 11 | ||
11 | # it's unknown to configure script, but then passed to extconf.rb | 12 | # it's unknown to configure script, but then passed to extconf.rb |