From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 14 May 2013 14:50:57 +0000 (+0200)
Subject: mds/Server.cc: fix possible NULL pointer dereference
X-Git-Tag: v0.63~29^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70a4a971f4b46e80d288abe413adb6e2876d8f71;p=ceph.git

mds/Server.cc: fix possible NULL pointer dereference

CID 1019555 (#1 of 1): Dereference after null check (FORWARD_NULL)
  var_deref_model: Passing null pointer "in" to function
  "Server::_need_force_journal(CInode *, bool)", which dereferences it.

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

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index d97047d6d49b..c9fac424f6f8 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -6943,7 +6943,7 @@ void Server::do_rename_rollback(bufferlist &rbl, int master, MDRequest *mdr)
   bool force_journal_dest = false;
   if (in && in->is_dir() && srcdn->authority().first != whoami)
     force_journal_src = _need_force_journal(in, false);
-  if (target && target->is_dir())
+  if (in && target && target->is_dir())
     force_journal_dest = _need_force_journal(in, true);
   
   version_t srcdnpv = 0;