fix CVE-2024-27282
(cherry picked from commit 8e743fd20e3f05d0fd4ede0c535e93c04d98353c)
This commit is contained in:
parent
5e724d0af0
commit
bc12870967
31
backport-CVE-2024-27282.patch
Normal file
31
backport-CVE-2024-27282.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From 989a2355808a63fc45367785c82ffd46d18c900a Mon Sep 17 00:00:00 2001
|
||||
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
|
||||
Date: Fri, 12 Apr 2024 15:01:47 +1000
|
||||
Subject: [PATCH] Fix Use-After-Free issue for Regexp
|
||||
|
||||
Co-authored-by: Isaac Peka <7493006+isaac-peka@users.noreply.github.com>
|
||||
|
||||
|
||||
Reference:https://github.com/ruby/rdoc/commit/989a2355808a63fc45367785c82ffd46d18c900a
|
||||
Conflict:NA
|
||||
---
|
||||
regexec.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/regexec.c b/regexec.c
|
||||
index 73694ab14a..140691ad42 100644
|
||||
--- a/regexec.c
|
||||
+++ b/regexec.c
|
||||
@@ -3449,8 +3449,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
|
||||
CASE(OP_MEMORY_END_PUSH_REC) MOP_IN(OP_MEMORY_END_PUSH_REC);
|
||||
GET_MEMNUM_INC(mem, p);
|
||||
STACK_GET_MEM_START(mem, stkp); /* should be before push mem-end. */
|
||||
- STACK_PUSH_MEM_END(mem, s);
|
||||
mem_start_stk[mem] = GET_STACK_INDEX(stkp);
|
||||
+ STACK_PUSH_MEM_END(mem, s);
|
||||
MOP_OUT;
|
||||
JUMP;
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
Name: ruby
|
||||
Version: %{ruby_version}
|
||||
Release: 139
|
||||
Release: 140
|
||||
Summary: Object-oriented scripting language interpreter
|
||||
License: (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD
|
||||
URL: https://www.ruby-lang.org/en/
|
||||
@ -90,6 +90,7 @@ Patch6006: backport-CVE-2019-16162.patch
|
||||
Patch6007: backport-CVE-2019-16163.patch
|
||||
Patch6015: backport-CVE-2023-36617.patch
|
||||
Patch6016: backport-CVE-2024-27281.patch
|
||||
Patch6017: backport-CVE-2024-27282.patch
|
||||
|
||||
Provides: %{name}-libs = %{version}-%{release}
|
||||
Obsoletes: %{name}-libs < %{version}-%{release}
|
||||
@ -875,6 +876,9 @@ make runruby TESTRUN_SCRIPT=%{SOURCE13}
|
||||
%{gem_dir}/specifications/matrix-%{matrix_version}.gemspec
|
||||
|
||||
%changelog
|
||||
* Mon May 6 2024 zhoupengcheng <zhoupengcheng11@huawei.com> - 3.2.2-140
|
||||
- fix CVE-2024-27282
|
||||
|
||||
* Tue Mar 26 2024 shixuantong <shixuantong1@huawei.com> - 3.2.2-139
|
||||
- fix CVE-2024-27281
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user