diff --git a/0009-fix-CVE-2022-0670.patch b/0009-fix-CVE-2022-0670.patch index a9c947f2297f33a0bdd95dc4bbbf6da4f2ed7183..2bacb5ff4ab8e3c14826bb527ec5b02dbda3af39 100644 --- a/0009-fix-CVE-2022-0670.patch +++ b/0009-fix-CVE-2022-0670.patch @@ -90,7 +90,7 @@ index 2840a9f2e..0d183e612 100644 def state(self): """ Subvolume state, one of SubvolumeStates """ - raise NotImplementedError -+ raise SubvolumeStates.from_value(self.metadata_mgr.get_global_option(MetadataManager.GLOBAL_META_KEY_STATE)) ++ return SubvolumeStates.from_value(self.metadata_mgr.get_global_option(MetadataManager.GLOBAL_META_KEY_STATE)) @property def subvol_type(self): diff --git a/ceph.spec b/ceph.spec index f2c14a296c42b1d20df4f99f7838cc5ef53a138b..d447035fc064f55165b0d5ea279b5503c06e963b 100644 --- a/ceph.spec +++ b/ceph.spec @@ -2502,6 +2502,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Mon May 20 2024 fwind43 - 2:16.2.7-18 +- fix error for cephfs subvolume + * Wed Oct 18 2023 wangzengliang - 2:16.2.7-18 - fix CVE-2023-43040 - sync from #PR 209