From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 3 Sep 2014 20:59:30 +0000 (+0200)
Subject: librbd.cc: add check to prevent null deref in rbd_list()
X-Git-Tag: v0.86~135^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7ccabbf91fd3b7609361d10d1430f7326579d1d1;p=ceph.git

librbd.cc: add check to prevent null deref in rbd_list()

Fix for :

CID 1192467 (2 of 2): Explicit null dereferenced (FORWARD_NULL)
 var_deref_model: Passing null pointer ibuf to rbd_list,
 which dereferences it.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/librbd/librbd.cc b/src/librbd/librbd.cc
index 24e191adfd0f..cde6dd98e10e 100644
--- a/src/librbd/librbd.cc
+++ b/src/librbd/librbd.cc
@@ -633,6 +633,9 @@ extern "C" int rbd_list(rados_ioctx_t p, char *names, size_t *size)
     return -ERANGE;
   }
 
+  if (!names) 
+    return -EINVAL;
+
   for (int i = 0; i < (int)cpp_names.size(); i++) {
     strcpy(names, cpp_names[i].c_str());
     names += strlen(names) + 1;