This change was cherry-picked 941c5eda, which was included in an upstream pull request at https://github.com/ceph/ceph/pull/63989 .
Without this change, ceph-mgr could crash when serving a ceph mgr command. Fixes: #6568 Signed-off-by: Kefu Chai <[email protected]> --- ...itly-dropping-ref-of-MgrOpRequest.re.patch | 27 +++++++++++++++++++ patches/series | 1 + 2 files changed, 28 insertions(+) create mode 100644 patches/0056-mgr-avoid-explicitly-dropping-ref-of-MgrOpRequest.re.patch diff --git a/patches/0056-mgr-avoid-explicitly-dropping-ref-of-MgrOpRequest.re.patch b/patches/0056-mgr-avoid-explicitly-dropping-ref-of-MgrOpRequest.re.patch new file mode 100644 index 00000000000..661ee825a4e --- /dev/null +++ b/patches/0056-mgr-avoid-explicitly-dropping-ref-of-MgrOpRequest.re.patch @@ -0,0 +1,27 @@ +From 941c5edac00b750e7a0d40c7f8b12b72d39178dc Mon Sep 17 00:00:00 2001 +From: Milind Changire <[email protected]> +Date: Fri, 4 Apr 2025 07:20:02 +0530 +Subject: [PATCH] mgr: avoid explicitly dropping ref of MgrOpRequest.request + +Fixes: 66efcaae7a05abaefb12758239b0e1ad5cbd85c9 +Fixes: https://tracker.ceph.com/issues/70618 +Signed-off-by: Milind Changire <[email protected]> +--- + src/mgr/MgrOpRequest.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/mgr/MgrOpRequest.h b/src/mgr/MgrOpRequest.h +index cc454aa6dc8..dd4ff21f5be 100644 +--- a/src/mgr/MgrOpRequest.h ++++ b/src/mgr/MgrOpRequest.h +@@ -52,7 +52,6 @@ protected: + + public: + ~MgrOpRequest() override { +- request->put(); + } + + template<class T> +-- +2.47.3 + diff --git a/patches/series b/patches/series index 6dd4562daa3..badc33a9969 100644 --- a/patches/series +++ b/patches/series @@ -53,3 +53,4 @@ 0053-mgr-zabbix-fix-invalid-escape-sequences.patch 0054-client-prohibit-unprivileged-users-from-setting-sgid.patch 0055-pybind-rbd-disable-on_progress-callbacks-to-prevent-.patch +0056-mgr-avoid-explicitly-dropping-ref-of-MgrOpRequest.re.patch -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
