RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/MgrStandby: prevent use-after-free on just-shut-down Mgr

Browse Source 
Fixes: http://tracker.ceph.com/issues/19595
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-05-25 18:25:27 -04:00
parent 25b8e0f63f
commit 890f482568
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mgr/MgrStandby.cc
View File

@ -258,8 +258,9 @@ bool MgrStandby::ms_dispatch(Message *m)
default:
if (active_mgr) {
auto am = active_mgr;
lock.Unlock();
active_mgr->ms_dispatch(m);
am->ms_dispatch(m);
lock.Lock();
} else {
return false;

2
src/mgr/MgrStandby.h
View File

@ -53,7 +53,7 @@ protected:
Mutex lock;
SafeTimer timer;
std::unique_ptr<Mgr> active_mgr;
std::shared_ptr<Mgr> active_mgr;
std::string state_str();