From 3802e9a7cdf13684e43ac06765c761bb91a26955 Mon Sep 17 00:00:00 2001 From: wangzengliang1 Date: Fri, 21 Feb 2025 10:37:41 +0800 Subject: [PATCH] fix-CVE-2024-48916 Signed-off-by: wangzengliang1 --- 0005-fix-CVE-2024-48916.patch | 33 +++++++++++++++++++++++++++++++++ ceph.spec | 6 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0005-fix-CVE-2024-48916.patch diff --git a/0005-fix-CVE-2024-48916.patch b/0005-fix-CVE-2024-48916.patch new file mode 100644 index 0000000..3f46370 --- /dev/null +++ b/0005-fix-CVE-2024-48916.patch @@ -0,0 +1,33 @@ +From 22b362ab9c7f72463f35addff53b34e301604104 Mon Sep 17 00:00:00 2001 +From: wangzengliang1 +Date: Sat, 28 Dec 2024 11:24:36 +0800 +Subject: [PATCH] fix CVE-2024-48916 +copyed-by: https://github.com/ceph/ceph/pull/60624 + while authenticating AssumeRoleWithWebIdentity using JWT obtained + from an external IDP. + +fixes: https://tracker.ceph.com/issues/68836 +Signed-off-by Pritha Srivastava +--- + src/rgw/rgw_rest_sts.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/rgw/rgw_rest_sts.cc b/src/rgw/rgw_rest_sts.cc +index 09f77f6..878edc6 100644 +--- a/src/rgw/rgw_rest_sts.cc ++++ b/src/rgw/rgw_rest_sts.cc +@@ -444,7 +444,11 @@ WebTokenEngine::validate_signature(const DoutPrefixProvider* dpp, const jwt::dec + .allow_algorithm(jwt::algorithm::ps512{cert}); + + verifier.verify(decoded); ++ } else { ++ ldpp_dout(dpp, 0) << "Unsupported algorithm: " << algorithm << dendl; ++ throw -EINVAL; + } ++ + } catch (std::runtime_error& e) { + ldpp_dout(dpp, 0) << "Signature validation failed: " << e.what() << dendl; + throw; +-- +1.8.3.1 + diff --git a/ceph.spec b/ceph.spec index 61550ca..6199c1b 100644 --- a/ceph.spec +++ b/ceph.spec @@ -174,7 +174,7 @@ ################################################################################# Name: ceph Version: 18.2.2 -Release: 5 +Release: 6 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -196,6 +196,7 @@ Patch1: 0001-modify-xsimd-source-to-local-and-set-cxx17-for-arrow.patch Patch2: 0002-fix-compilation-with-cython3.patch Patch3: 0003-fix-CVE-2023-46159.patch Patch4: 0004-fix-mds-metadata-lost-in-one-case.patch +Patch5: 0005-fix-CVE-2024-48916.patch %ifarch loongarch64 Patch5: 9001-add-supprot-for-loongarch64.patch @@ -2643,6 +2644,9 @@ exit 0 %{_datadir}/snmp/mibs %changelog +* Fri Feb 21 2025 wangzengliang - 2:18.2.2-6 +- fix-CVE-2024-48916 + * Sat May 25 2024 laokz - 2:18.2.2-5 - let BuildRequires:valgrind-devel depend on system arch macro - fix riscv64 build -- Gitee