From 0842a02228b0e05afe24b3878077adeddf2793bb Mon Sep 17 00:00:00 2001 From: Thiruvadi Rajaraman Date: Sat, 4 Nov 2017 10:35:54 -0700 Subject: ruby: Security fix for CVE-2017-9227 affects ruby < 2.4.1 Signed-off-by: Thiruvadi Rajaraman Signed-off-by: Armin Kuster (cherry picked from commit d83f18936a0eb470e8faf7adbd7c580c23fa3370) Signed-off-by: Armin Kuster --- .../recipes-devtools/ruby/ruby/CVE-2017-9227.patch | 24 ++++++++++++++++++++++ meta/recipes-devtools/ruby/ruby_2.2.5.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2017-9227.patch diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2017-9227.patch b/meta/recipes-devtools/ruby/ruby/CVE-2017-9227.patch new file mode 100644 index 0000000000..f6eaefb7fd --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/CVE-2017-9227.patch @@ -0,0 +1,24 @@ +commit 9690d3ab1f9bcd2db8cbe1fe3ee4a5da606b8814 +Author: K.Kosako +Date: Tue May 23 16:15:35 2017 +0900 + + fix #58 : access to invalid address by reg->dmin value + +Upstream-Status: backport + +CVE: CVE-2017-9227 +Signed-off-by: Thiruvadi Rajaraman + +Index: ruby-2.2.5/regexec.c +=================================================================== +--- ruby-2.2.5.orig/regexec.c 2014-09-15 21:48:41.000000000 +0530 ++++ ruby-2.2.5/regexec.c 2017-08-30 12:18:04.054828426 +0530 +@@ -3678,6 +3678,8 @@ + } + else { + UChar *q = p + reg->dmin; ++ ++ if (q >= end) return 0; /* fail */ + while (p < q) p += enclen(reg->enc, p, end); + } + } diff --git a/meta/recipes-devtools/ruby/ruby_2.2.5.bb b/meta/recipes-devtools/ruby/ruby_2.2.5.bb index bae1697cc4..dafeab5b1a 100644 --- a/meta/recipes-devtools/ruby/ruby_2.2.5.bb +++ b/meta/recipes-devtools/ruby/ruby_2.2.5.bb @@ -5,6 +5,7 @@ SRC_URI[sha256sum] = "30c4b31697a4ca4ea0c8db8ad30cf45e6690a0f09687e5d483c933c03c SRC_URI += "file://prevent-gc.patch \ file://CVE-2016-7798.patch \ + file://CVE-2017-9227.patch \ " # it's unknown to configure script, but then passed to extconf.rb -- cgit 1.2.3-korg