summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch29
-rw-r--r--meta/recipes-devtools/ruby/ruby_3.1.3.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch b/meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch
new file mode 100644
index 0000000000..5d64a51488
--- /dev/null
+++ b/meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch
@@ -0,0 +1,29 @@
1From 989a2355808a63fc45367785c82ffd46d18c900a Mon Sep 17 00:00:00 2001
2From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
3Date: Fri, 12 Apr 2024 15:01:47 +1000
4Subject: [PATCH] Fix Use-After-Free issue for Regexp
5
6Co-authored-by: Isaac Peka <7493006+isaac-peka@users.noreply.github.com>
7
8Upstream-Status: Backport [https://github.com/ruby/ruby/commit/989a2355808a63fc45367785c82ffd46d18c900a]
9CVE: CVE-2024-27282
10Signed-off-by: Ashish Sharma <asharma@mvista.com>
11
12
13 regexec.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/regexec.c b/regexec.c
17index 73694ab14a0b0a..140691ad42489f 100644
18--- a/regexec.c
19+++ b/regexec.c
20@@ -3449,8 +3449,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
21 CASE(OP_MEMORY_END_PUSH_REC) MOP_IN(OP_MEMORY_END_PUSH_REC);
22 GET_MEMNUM_INC(mem, p);
23 STACK_GET_MEM_START(mem, stkp); /* should be before push mem-end. */
24- STACK_PUSH_MEM_END(mem, s);
25 mem_start_stk[mem] = GET_STACK_INDEX(stkp);
26+ STACK_PUSH_MEM_END(mem, s);
27 MOP_OUT;
28 JUMP;
29
diff --git a/meta/recipes-devtools/ruby/ruby_3.1.3.bb b/meta/recipes-devtools/ruby/ruby_3.1.3.bb
index d4b977cdfe..7a927d2041 100644
--- a/meta/recipes-devtools/ruby/ruby_3.1.3.bb
+++ b/meta/recipes-devtools/ruby/ruby_3.1.3.bb
@@ -35,6 +35,7 @@ SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
35 file://CVE-2023-36617_2.patch \ 35 file://CVE-2023-36617_2.patch \
36 file://CVE-2024-27281.patch \ 36 file://CVE-2024-27281.patch \
37 file://CVE-2024-27280.patch \ 37 file://CVE-2024-27280.patch \
38 file://CVE-2024-27282.patch \
38 " 39 "
39UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/" 40UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
40 41