From: Kefu Chai <k.chai@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ceph master v1] backport use-after-fix fix in mgr
Date: Tue, 16 Dec 2025 20:56:42 +0800 [thread overview]
Message-ID: <20251216125648.546017-2-k.chai@proxmox.com> (raw)
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 <k.chai@proxmox.com>
---
...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 <mchangir@redhat.com>
+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 <mchangir@redhat.com>
+---
+ 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
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next reply other threads:[~2025-12-16 12:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-16 12:56 Kefu Chai [this message]
2025-12-17 8:01 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251216125648.546017-2-k.chai@proxmox.com \
--to=k.chai@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox