From 988ff14ea468e180c2d007becbdce88c62f3685e Mon Sep 17 00:00:00 2001 From: wangzengliang1 Date: Mon, 24 Feb 2025 16:46:57 +0800 Subject: [PATCH] fix CVE-2024-48916 Signed-off-by: wangzengliang1 --- 0017-fix-CVE-2024-48916.patch | 33 +++++++++++++++++++++++++++++++++ ceph.spec | 6 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0017-fix-CVE-2024-48916.patch diff --git a/0017-fix-CVE-2024-48916.patch b/0017-fix-CVE-2024-48916.patch new file mode 100644 index 0000000..8f38e35 --- /dev/null +++ b/0017-fix-CVE-2024-48916.patch @@ -0,0 +1,33 @@ +From d543770ca4c0ae6a9882cb5796298d9240f42e6f Mon Sep 17 00:00:00 2001 +From: wangzengliang1 +Date: Mon, 20 Jan 2025 11:05:26 +0800 +Subject: [PATCH] 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 af1b96c..9c24c68 100644 +--- a/src/rgw/rgw_rest_sts.cc ++++ b/src/rgw/rgw_rest_sts.cc +@@ -291,7 +291,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 7ed3a14..26857a2 100644 --- a/ceph.spec +++ b/ceph.spec @@ -125,7 +125,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 21 +Release: 22 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -159,6 +159,7 @@ Patch13: 0013-add-atomic-library-for-loongarch64.patch Patch14: 0014-fix-CVE-2022-3854.patch Patch15: 0015-Fix-CVE-2023-43040.patch Patch16: 0016-fix-CVE-2023-46159.patch +Patch17: 0017-fix-CVE-2024-48916.patch %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -2505,6 +2506,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Mon Feb 24 2025 wangzengliang - 2:16.2.7-22 +- 0017-fix-CVE-2024-48916 + * Tue May 28 2024 fwind43 - 2:16.2.7-21 - fix error for cephfs subvolume -- Gitee