]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore/BitAllocator: fix potential null pointer access
authorxie xingguo <xie.xingguo@zte.com.cn>
Sat, 24 Dec 2016 08:48:24 +0000 (16:48 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Tue, 27 Dec 2016 00:44:34 +0000 (08:44 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/os/bluestore/BitAllocator.cc

index 1b48fa0abf08dd327e11cca63c09fc16da7d0539..105e622c6d12700d7f792991b2fa8f00803a5c8f 100644 (file)
@@ -581,6 +581,9 @@ int64_t BitMapZone::alloc_blocks_dis(int64_t num_blocks,
   BitMapEntityIter <BmapEntry> iter = BitMapEntityIter<BmapEntry>(
           m_bmap_list, bmap_idx);
   bmap = iter.next();
+  if (!bmap) {
+    return 0;
+  }
 
   while (allocated < num_blocks) {
     blk_off = zone_blk_off + bmap_idx * bmap->size();