MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ruby: Security fix for CVE-2017-9229

Browse Source 
affects ruby < 2.4.1

(From OE-Core rev: a636bf8cb5063f349b2af6594b131af6852b3076)

Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Thiruvadi Rajaraman 2017-11-04 10:41:02 -07:00 committed by Richard Purdie
parent 7039d1ad32
commit 32c81fb55d
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
meta/recipes-devtools/ruby/ruby/CVE-2017-9229.patch Normal file
View File

@ -0,0 +1,36 @@
commit b690371bbf97794b4a1d3f295d4fb9a8b05d402d
Author: K.Kosako <kosako@sofnec.co.jp>
Date: Wed May 24 10:27:04 2017 +0900
fix #59 : access to invalid address by reg->dmax value
Upstream-Status: Backport
CVE: CVE-2017-9229
Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com>
Index: ruby-2.2.5/regexec.c
===================================================================
--- ruby-2.2.5.orig/regexec.c 2017-09-13 12:17:08.429254209 +0530
+++ ruby-2.2.5/regexec.c 2017-09-13 12:24:03.365312311 +0530
@@ -3763,6 +3763,12 @@
}
else {
if (reg->dmax != ONIG_INFINITE_DISTANCE) {
+ if (p - str < reg->dmax) {
+ *low = (UChar* )str;
+ if (low_prev)
+ *low_prev = onigenc_get_prev_char_head(reg->enc, str, *low, end);
+ }
+ else {
*low = p - reg->dmax;
if (*low > s) {
*low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s,
@@ -3776,6 +3782,7 @@
*low_prev = onigenc_get_prev_char_head(reg->enc,
(pprev ? pprev : str), *low, end);
}
+ }
}
}
/* no needs to adjust *high, *high is used as range check only */

1
meta/recipes-devtools/ruby/ruby_2.2.5.bb
View File

@ -8,6 +8,7 @@ SRC_URI += "file://prevent-gc.patch \
file://CVE-2017-9227.patch \
file://CVE-2017-9228.patch \
file://CVE-2017-9226.patch \
file://CVE-2017-9229.patch \
"
# it's unknown to configure script, but then passed to extconf.rb