From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Fri, 31 May 2013 17:07:45 +0000 (+0200)
Subject: mds/Server.cc: fix dereference after null check
X-Git-Tag: v0.65~168^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfdd87cac9c24365700a28d6138665f4a6ae07b9;p=ceph.git

mds/Server.cc: fix dereference after null check

CID 716927 (#1 of 1): Dereference after null check (FORWARD_NULL)
  var_deref_model: Passing null pointer "diri->snaprealm" to function
  "SnapRealm::resolve_snapname(std::string const &

Make sure not to dereference diri->snaprealm.

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

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 5b23b7ff837..abeea2c12d5 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -7445,8 +7445,7 @@ void Server::handle_client_rmsnap(MDRequest *mdr)
     reply_request(mdr, -EINVAL);   // can't prune a parent snap, currently.
     return;
   }
-  if (diri->snaprealm &&
-      !diri->snaprealm->exists(snapname)) {
+  if (!diri->snaprealm || !diri->snaprealm->exists(snapname)) {
     reply_request(mdr, -ENOENT);
     return;
   }