From: xiexingguo <258156334@qq.com>
Date: Thu, 29 Oct 2015 09:32:50 +0000 (+0800)
Subject: Objecter: potential null pointer access when do pool_snap_list.
X-Git-Tag: v9.2.1~16^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43dede3144f98de16f8373f376e716f2f73b6f82;p=ceph.git

Objecter: potential null pointer access when do pool_snap_list.

Objecter: potential null pointer access when do pool_snap_list. Shall check pool existence first.
Fixes: #13639
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 865541605b6c32f03e188ec33d079b44be42fa4a)
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 60efe3ae469d..9a65f2e6007f 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1312,6 +1312,8 @@ int Objecter::pool_snap_list(int64_t poolid, vector<uint64_t> *snaps)
   RWLock::RLocker rl(rwlock);
 
   const pg_pool_t *pi = osdmap->get_pg_pool(poolid);
+  if (!pi)
+    return -ENOENT;
   for (map<snapid_t,pool_snap_info_t>::const_iterator p = pi->snaps.begin();
        p != pi->snaps.end();
        ++p) {