From e519da590426914f793da3aa8217c4dd0704d0fb Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Tue, 14 Jul 2020 20:40:11 +0800 Subject: [PATCH] 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" (cherry picked from commit 6715514aa577842942a1221a0f25924c53e03834) --- src/mds/MDCache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index eff653ee69f93..f771ca5455622 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -3553,7 +3553,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); -- 2.39.5