Skip to content

Commit 6f5f1ed

Browse files
CBL-Mariner-Botarc9693jslobodzian
authored
[AUTO-CHERRYPICK] cri-o: add patch for CVE-2024-44337 [Medium] - branch main (#13148)
Co-authored-by: Archana Choudhary <36061892+arc9693@users.noreply.github.com> Co-authored-by: jslobodzian <joslobo@microsoft.com>
1 parent 5fe667b commit 6f5f1ed

2 files changed

Lines changed: 26 additions & 3 deletions

File tree

SPECS/cri-o/CVE-2024-44337.patch

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# From: Archana Choudhary <archana1@microsoft.com>
2+
# Date: Wed, 9 Oct 2024 09:54:22 -0400
3+
# Subject: [PATCH] Fixes CVE-2024-44337
4+
# Backported(fixed fuzzing) from the original patch by Krzysztof Kowalczyk <kkowalczyk@gmail.com>
5+
# Source: https://github.com/gomarkdown/markdown/commit/a2a9c4f76ef5a5c32108e36f7c47f8d310322252
6+
7+
--- a/vendor/github.com/gomarkdown/markdown/parser/block.go.orig 2021-04-26 00:00:00.000000000 +0000
8+
+++ b/vendor/github.com/gomarkdown/markdown/parser/block.go 2024-11-06 09:25:11.349954099 +0000
9+
@@ -1825,7 +1825,9 @@
10+
if p.extensions&DefinitionLists != 0 {
11+
if i < len(data)-1 && data[i+1] == ':' {
12+
listLen := p.list(data[prev:], ast.ListTypeDefinition, 0)
13+
- return prev + listLen
14+
+ if listLen > 0 {
15+
+ return prev + listLen
16+
+ }
17+
}
18+
}
19+

SPECS/cri-o/cri-o.spec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Summary: OCI-based implementation of Kubernetes Container Runtime Interfa
2626
# Define macros for further referenced sources
2727
Name: cri-o
2828
Version: 1.22.3
29-
Release: 11%{?dist}
29+
Release: 12%{?dist}
3030
License: ASL 2.0
3131
Vendor: Microsoft Corporation
3232
Distribution: Mariner
@@ -73,7 +73,8 @@ Patch17: CVE-2024-9341.patch
7373
Patch18: CVE-2024-45338.patch
7474
Patch19: CVE-2023-0778.patch
7575
Patch20: CVE-2023-6476.patch
76-
Patch21: CVE-2025-27144.patch
76+
Patch21: CVE-2024-44337.patch
77+
Patch22: CVE-2025-27144.patch
7778
BuildRequires: btrfs-progs-devel
7879
BuildRequires: device-mapper-devel
7980
BuildRequires: fdupes
@@ -226,9 +227,12 @@ mkdir -p /opt/cni/bin
226227
%{_fillupdir}/sysconfig.kubelet
227228

228229
%changelog
229-
* Fri Mar 21 2025 Dallas Delaney <dadelan@microsoft.com> - 1.22.3-11
230+
* Fri Mar 21 2025 Dallas Delaney <dadelan@microsoft.com> - 1.22.3-12
230231
- Add patch for CVE-2025-27144
231232

233+
* Fri Mar 21 2025 Archana Choudhary <archana1@microsoft.com> - 1.22.3-11
234+
- Add patch for CVE-2024-44337
235+
232236
* Thu Jan 23 2025 Sumedh Sharma <sumsharma@microsoft.com> - 1.22.3-10
233237
- Add patch for CVE-2023-0778 & CVE-2023-6476.
234238

0 commit comments

Comments
 (0)