diff options
author | Joe Slater <joe.slater@windriver.com> | 2018-07-20 14:10:02 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-26 13:16:40 +0100 |
commit | 201cfa33fe31d90c333cfbd465a16a392d5c4148 (patch) | |
tree | 8afff1b94239f2332b0ab7fd1a0a5a9fe22af1a1 | |
parent | 62f5f01b5bf4287a44f9f89db5c5d65bfd9873ad (diff) | |
download | poky-201cfa33fe31d90c333cfbd465a16a392d5c4148.tar.gz |
ruby: security fix CVE 2018-1000073
Directory traversal vulnerability as described by
https://nvd.nist.gov/vuln/detail/CVE-2018-1000073.
(From OE-Core rev: 1a0a1785766c12003e3f8848852af84cae203e6b)
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/ruby/ruby/CVE-2018-1000073.patch | 34 | ||||
-rw-r--r-- | meta/recipes-devtools/ruby/ruby_2.5.1.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2018-1000073.patch b/meta/recipes-devtools/ruby/ruby/CVE-2018-1000073.patch new file mode 100644 index 0000000000..22fa1b5f4d --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/CVE-2018-1000073.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 1b931fc03b819b9a0214be3eaca844ef534175e2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Claudius <jclaudius@mozilla.com> | ||
3 | Date: Wed, 7 Feb 2018 23:54:52 -0500 | ||
4 | Subject: [PATCH] Non-working patch for deducing symlinked base-dirs | ||
5 | |||
6 | --- | ||
7 | CVE: CVE-2018-1000073 | ||
8 | |||
9 | Fixed in ruby 2.7.6. | ||
10 | |||
11 | Upstream-Status: Backport [github.com/rubygems/rubygems/commit/1b931fc...] | ||
12 | |||
13 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
14 | |||
15 | --- | ||
16 | lib/rubygems/package.rb | 2 ++ | ||
17 | 1 file changed, 2 insertions(+) | ||
18 | |||
19 | diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb | ||
20 | index dede959..cb9c74a 100644 | ||
21 | --- a/lib/rubygems/package.rb | ||
22 | +++ b/lib/rubygems/package.rb | ||
23 | @@ -421,6 +421,8 @@ EOM | ||
24 | destination_dir = File.expand_path destination_dir | ||
25 | |||
26 | destination = File.join destination_dir, filename | ||
27 | + destination = File.realpath destination if | ||
28 | + File.respond_to? :realpath | ||
29 | destination = File.expand_path destination | ||
30 | |||
31 | raise Gem::Package::PathError.new(destination, destination_dir) unless | ||
32 | -- | ||
33 | 1.7.9.5 | ||
34 | |||
diff --git a/meta/recipes-devtools/ruby/ruby_2.5.1.bb b/meta/recipes-devtools/ruby/ruby_2.5.1.bb index 91048284c1..af2739a43d 100644 --- a/meta/recipes-devtools/ruby/ruby_2.5.1.bb +++ b/meta/recipes-devtools/ruby/ruby_2.5.1.bb | |||
@@ -3,6 +3,7 @@ require ruby.inc | |||
3 | SRC_URI += " \ | 3 | SRC_URI += " \ |
4 | file://ruby-CVE-2017-9226.patch \ | 4 | file://ruby-CVE-2017-9226.patch \ |
5 | file://ruby-CVE-2017-9228.patch \ | 5 | file://ruby-CVE-2017-9228.patch \ |
6 | file://CVE-2018-1000073.patch \ | ||
6 | " | 7 | " |
7 | 8 | ||
8 | SRC_URI[md5sum] = "23867bc8c16c55e43b14dfe0614bcfa8" | 9 | SRC_URI[md5sum] = "23867bc8c16c55e43b14dfe0614bcfa8" |