Skip to content

Commit b374a52

Browse files
CBL-Mariner-Botazurelinux-securityKanishk-Bansal
authored
Merge PR "[AUTO-CHERRYPICK] [AutoPR- Security] Patch ceph for CVE-2024-47866 [HIGH] - branch 3.0-dev" microsoft#15127
Co-authored-by: Azure Linux Security Servicing Account <[email protected]> Co-authored-by: Kanishk Bansal <[email protected]>
1 parent 6862bc2 commit b374a52

File tree

2 files changed

+39
-2
lines changed

2 files changed

+39
-2
lines changed

SPECS/ceph/CVE-2024-47866.patch

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
From a22a0dbb1d46322007ac4b4e87854ba2ccc8335a Mon Sep 17 00:00:00 2001
2+
From: Suyash Dongre <[email protected]>
3+
Date: Wed, 20 Aug 2025 23:22:41 +0530
4+
Subject: [PATCH] Check if `HTTP_X_AMZ_COPY_SOURCE` header is empty
5+
6+
The issue was that the `HTTP_X_AMZ_COPY_SOURCE` header could be present but empty (i.e., an empty string rather than NULL). The code only checked if the pointer was not NULL, but didn't verify that the string had content. When an empty string was passed to RGWCopyObj::parse_copy_location(), it would eventually try to access name_str[0] on an empty string, causing a crash.
7+
8+
Fixes: https://tracker.ceph.com/issues/72669
9+
10+
Signed-off-by: Suyash Dongre <[email protected]>
11+
Signed-off-by: Azure Linux Security Servicing Account <[email protected]>
12+
Upstream-reference: https://patch-diff.githubusercontent.com/raw/ceph/ceph/pull/65159.patch
13+
---
14+
src/rgw/rgw_op.cc | 3 +++
15+
1 file changed, 3 insertions(+)
16+
17+
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
18+
index 71fb198..68f74b7 100644
19+
--- a/src/rgw/rgw_op.cc
20+
+++ b/src/rgw/rgw_op.cc
21+
@@ -5240,6 +5240,9 @@ bool RGWCopyObj::parse_copy_location(const std::string_view& url_src,
22+
params_str = url_src.substr(pos + 1);
23+
}
24+
25+
+ if (name_str.empty()) {
26+
+ return false;
27+
+ }
28+
if (name_str[0] == '/') // trim leading slash
29+
name_str.remove_prefix(1);
30+
31+
--
32+
2.45.4
33+

SPECS/ceph/ceph.spec

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Summary: User space components of the Ceph file system
66
Name: ceph
77
Version: 18.2.2
8-
Release: 11%{?dist}
8+
Release: 12%{?dist}
99
License: LGPLv2 and LGPLv3 and CC-BY-SA and GPLv2 and Boost and BSD and MIT and Public Domain and GPLv3 and ASL-2.0
1010
URL: https://ceph.io/
1111
Vendor: Microsoft Corporation
@@ -31,6 +31,7 @@ Patch16: CVE-2020-14378.patch
3131
Patch17: CVE-2025-52555.patch
3232
Patch18: CVE-2024-48916.patch
3333
Patch19: CVE-2025-9648.patch
34+
Patch20: CVE-2024-47866.patch
3435
#
3536
# Copyright (C) 2004-2019 The Ceph Project Developers. See COPYING file
3637
# at the top-level directory of this distribution and at
@@ -2021,6 +2022,9 @@ exit 0
20212022
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
20222023

20232024
%changelog
2025+
* Thu Nov 13 2025 Azure Linux Security Servicing Account <[email protected]> - 18.2.2-12
2026+
- Patch for CVE-2024-47866
2027+
20242028
* Fri Oct 03 2025 Azure Linux Security Servicing Account <[email protected]> - 18.2.2-11
20252029
- Patch for CVE-2025-9648
20262030

@@ -2030,7 +2034,7 @@ exit 0
20302034
* Tue Jul 01 2025 Azure Linux Security Servicing Account <[email protected]> - 18.2.2-9
20312035
- Patch for CVE-2025-52555
20322036

2033-
* Wed 16 Apr 2025 Archana Shettigar <[email protected]> - 18.2.2-8
2037+
* Wed Apr 16 2025 Archana Shettigar <[email protected]> - 18.2.2-8
20342038
- Patch CVE-2020-14378
20352039

20362040
* Thu Apr 10 2025 Kanishk Bansal <[email protected]> - 18.2.2-7

0 commit comments

Comments
 (0)