From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Sun, 23 Mar 2014 00:02:08 +0000 (+0800)
Subject: mds: fix null pointer dereference in MDCache::rejoin_send_rejoins()
X-Git-Tag: v0.79~52^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb19100f444e4f6c970f93a234f6a08c11510366;p=ceph.git

mds: fix null pointer dereference in MDCache::rejoin_send_rejoins()

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 4a4957ba4091..4b48465d612b 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -3616,6 +3616,8 @@ void MDCache::rejoin_send_rejoins()
 	 ++p) {
       assert(cap_export_targets.count(p->first));
       int target = cap_export_targets[p->first];
+      if (rejoins.count(target) == 0)
+	continue;
       rejoins[target]->cap_exports[p->first] = p->second;
       for (map<client_t,ceph_mds_cap_reconnect>::iterator q = p->second.begin();
 	   q != p->second.end();