mirror of
https://git.yoctoproject.org/poky
synced 2026-07-22 17:57:01 +00:00
Divya Chellam
7c4bd642e4
REXML is an XML toolkit for Ruby. The REXML gem before 3.3.1 has some DoS vulnerabilities when it parses an XML that has many specific characters such as `<`, `0` and `%>`. If you need to parse untrusted XMLs, you many be impacted to these vulnerabilities. The REXML gem 3.3.2 or later include the patches to fix these vulnerabilities. Users are advised to upgrade. Users unable to upgrade should avoid parsing untrusted XML strings. Reference: https://security-tracker.debian.org/tracker/CVE-2024-39908 Upstream-patches: https://github.com/ruby/rexml/commit/f1df7d13b3e57a5e059273d2f0870163c08d7420 https://github.com/ruby/rexml/commit/d146162e9a61574499d10428bc0065754cd26601 https://github.com/ruby/rexml/commit/b5bf109a599ea733663150e99c09eb44046b41dd https://github.com/ruby/rexml/commit/b8a5f4cd5c8fe29c65d7a00e67170223d9d2b50e https://github.com/ruby/rexml/commit/0af55fa49d4c9369f90f239a9571edab800ed36e https://github.com/ruby/rexml/commit/c1b64c174ec2e8ca2174c51332670e3be30c865f https://github.com/ruby/rexml/commit/9f1415a2616c77cad44a176eee90e8457b4774b6 https://github.com/ruby/rexml/commit/c33ea498102be65082940e8b7d6d31cb2c6e6ee2 https://github.com/ruby/rexml/commit/a79ac8b4b42a9efabe33a0be31bd82d33fd50347 https://github.com/ruby/rexml/commit/67efb5951ed09dbb575c375b130a1e469f437d1f https://github.com/ruby/rexml/commit/1f1e6e9b40bf339894e843dfd679c2fb1a5ddbf2 https://github.com/ruby/rexml/commit/910e5a2b487cb5a30989884a39f9cad2cc499cfc (From OE-Core rev: 6e0b70843422cd7cdb25a9e1520dd64bf701fea6) Signed-off-by: Divya Chellam <divya.chellam@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From b5bf109a599ea733663150e99c09eb44046b41dd Mon Sep 17 00:00:00 2001
|
|
From: Hiroya Fujinami <make.just.on@gmail.com>
|
|
Date: Thu, 13 Jun 2024 15:12:32 +0900
|
|
Subject: [PATCH] Add a "malformed comment" check for top-level comments (#145)
|
|
|
|
This check was missing. Therefore, `REXML::Document.new("<!--")` raised
|
|
the ``undefined method `[]' for nil`` error, for example.
|
|
|
|
This PR also adds tests for "malformed comment" checks.
|
|
|
|
---------
|
|
|
|
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
|
|
|
|
CVE: CVE-2024-39908
|
|
|
|
Upstream-Status: Backport [https://github.com/ruby/rexml/commit/b5bf109a599ea733663150e99c09eb44046b41dd]
|
|
|
|
Signed-off-by: Divya Chellam <divya.chellam@windriver.com>
|
|
---
|
|
.bundle/gems/rexml-3.2.5/lib/rexml/parsers/baseparser.rb | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/.bundle/gems/rexml-3.2.5/lib/rexml/parsers/baseparser.rb b/.bundle/gems/rexml-3.2.5/lib/rexml/parsers/baseparser.rb
|
|
index 81415a8..49c313c 100644
|
|
--- a/.bundle/gems/rexml-3.2.5/lib/rexml/parsers/baseparser.rb
|
|
+++ b/.bundle/gems/rexml-3.2.5/lib/rexml/parsers/baseparser.rb
|
|
@@ -236,7 +236,14 @@ module REXML
|
|
return process_instruction(start_position)
|
|
elsif @source.match("<!", true)
|
|
if @source.match("--", true)
|
|
- return [ :comment, @source.match(/(.*?)-->/um, true)[1] ]
|
|
+ md = @source.match(/(.*?)-->/um, true)
|
|
+ if md.nil?
|
|
+ raise REXML::ParseException.new("Unclosed comment", @source)
|
|
+ end
|
|
+ if /--|-\z/.match?(md[1])
|
|
+ raise REXML::ParseException.new("Malformed comment", @source)
|
|
+ end
|
|
+ return [ :comment, md[1] ]
|
|
elsif @source.match("DOCTYPE", true)
|
|
base_error_message = "Malformed DOCTYPE"
|
|
unless @source.match(/\s+/um, true)
|
|
--
|
|
2.40.0
|
|
|