mirror of
https://git.yoctoproject.org/poky
synced 2026-06-28 05:13:38 +02:00
88ccb9dabb
References:
https://github.com/ruby/ruby/pull/10316
https://security-tracker.debian.org/tracker/CVE-2024-27281
Upstream-Status: Backport from da7a0c7553
(From OE-Core rev: 16685f3b2d22eac20f0134cbd589c3b23a187084)
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
98 lines
2.7 KiB
Diff
98 lines
2.7 KiB
Diff
From da7a0c7553ef7250ca665a3fecdc01dbaacbb43d Mon Sep 17 00:00:00 2001
|
|
From: Nobuyoshi Nakada <nobu@...>
|
|
Date: Mon, 15 Apr 2024 11:40:00 +0000
|
|
Subject: [PATCH] Filter marshaled objets
|
|
|
|
CVE: CVE-2024-27281
|
|
Upstream-Status: Backport [https://github.com/ruby/rdoc/commit/da7a0c7553ef7250ca665a3fecdc01dbaacbb43d]
|
|
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
|
|
---
|
|
lib/rdoc/store.rb | 45 ++++++++++++++++++++++++++-------------------
|
|
1 file changed, 26 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb
|
|
index 9fc540d..5b663d7 100644
|
|
--- a/lib/rdoc/store.rb
|
|
+++ b/lib/rdoc/store.rb
|
|
@@ -556,9 +556,7 @@ class RDoc::Store
|
|
def load_cache
|
|
#orig_enc = @encoding
|
|
|
|
- File.open cache_path, 'rb' do |io|
|
|
- @cache = Marshal.load io
|
|
- end
|
|
+ @cache = marshal_load(cache_path)
|
|
|
|
load_enc = @cache[:encoding]
|
|
|
|
@@ -615,9 +613,7 @@ class RDoc::Store
|
|
def load_class_data klass_name
|
|
file = class_file klass_name
|
|
|
|
- File.open file, 'rb' do |io|
|
|
- Marshal.load io
|
|
- end
|
|
+ marshal_load(file)
|
|
rescue Errno::ENOENT => e
|
|
error = MissingFileError.new(self, file, klass_name)
|
|
error.set_backtrace e.backtrace
|
|
@@ -630,14 +626,10 @@ class RDoc::Store
|
|
def load_method klass_name, method_name
|
|
file = method_file klass_name, method_name
|
|
|
|
- File.open file, 'rb' do |io|
|
|
- obj = Marshal.load io
|
|
- obj.store = self
|
|
- obj.parent =
|
|
- find_class_or_module(klass_name) || load_class(klass_name) unless
|
|
- obj.parent
|
|
- obj
|
|
- end
|
|
+ obj = marshal_load(file)
|
|
+ obj.store = self
|
|
+ obj.parent ||= find_class_or_module(klass_name) || load_class(klass_name)
|
|
+ obj
|
|
rescue Errno::ENOENT => e
|
|
error = MissingFileError.new(self, file, klass_name + method_name)
|
|
error.set_backtrace e.backtrace
|
|
@@ -650,11 +642,9 @@ class RDoc::Store
|
|
def load_page page_name
|
|
file = page_file page_name
|
|
|
|
- File.open file, 'rb' do |io|
|
|
- obj = Marshal.load io
|
|
- obj.store = self
|
|
- obj
|
|
- end
|
|
+ obj = marshal_load(file)
|
|
+ obj.store = self
|
|
+ obj
|
|
rescue Errno::ENOENT => e
|
|
error = MissingFileError.new(self, file, page_name)
|
|
error.set_backtrace e.backtrace
|
|
@@ -976,4 +966,21 @@ class RDoc::Store
|
|
@unique_modules
|
|
end
|
|
|
|
+ private
|
|
+ def marshal_load(file)
|
|
+ File.open(file, 'rb') {|io| Marshal.load(io, MarshalFilter)}
|
|
+ end
|
|
+
|
|
+ MarshalFilter = proc do |obj|
|
|
+ case obj
|
|
+ when true, false, nil, Array, Class, Encoding, Hash, Integer, String, Symbol, RDoc::Text
|
|
+ else
|
|
+ unless obj.class.name.start_with("RDoc::")
|
|
+ raise TypeError, "not permitted class: #{obj.class.name}"
|
|
+ end
|
|
+ end
|
|
+ obj
|
|
+ end
|
|
+ private_constant :MarshalFilter
|
|
+
|
|
end
|
|
--
|
|
2.25.1
|
|
|