From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 12 Mar 2014 19:09:22 +0000 (+0100)
Subject: mds/Server.cc: check straydn before dereference
X-Git-Tag: v0.79~149^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5334d5c808abbcf8e790fccb62069228fabb42e3;p=ceph.git

mds/Server.cc: check straydn before dereference

ID 1019554 (#1 of 1): Dereference after null check (FORWARD_NULL)
 13. var_deref_model: Passing null pointer "straydn" to function
 "MDSCacheObject::is_auth() const", 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 a1327662d9b2..cee1ef6a3654 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -6043,7 +6043,7 @@ void Server::_rename_prepare(MDRequest *mdr,
   }
 
   bool force_journal_stray = false;
-  if (oldin && oldin->is_dir() && !straydn->is_auth())
+  if (oldin && oldin->is_dir() && straydn && !straydn->is_auth())
     force_journal_stray = _need_force_journal(oldin, true);
 
   if (linkmerge)