From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 14 Jul 2020 12:40:11 +0000 (+0800)
Subject: mds: fix nullptr dereference in MDCache::finish_rollback
X-Git-Tag: v15.2.9~122^2~26^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7af2dba23d19fc8f3ea1a688591c20b69cf56002;p=ceph.git

mds: fix nullptr dereference in MDCache::finish_rollback

introduced by commit 4940ab62e0d
"mds: preserve ESlaveUpdate::OP_PREPARE logevent before doing commit"

Fixes: https://tracker.ceph.com/issues/46533
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 6715514aa577842942a1221a0f25924c53e03834)
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 88eece19f00b..84647a339529 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -3587,7 +3587,7 @@ MDSlaveUpdate* MDCache::get_uncommitted_slave(metareqid_t reqid, mds_rank_t mast
 }
 
 void MDCache::finish_rollback(metareqid_t reqid, MDRequestRef& mdr) {
-  auto p = resolve_need_rollback.find(mdr->reqid);
+  auto p = resolve_need_rollback.find(reqid);
   ceph_assert(p != resolve_need_rollback.end());
   if (mds->is_resolve()) {
     finish_uncommitted_slave(reqid, false);