summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-05-14 16:50:57 +0200
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-05-14 18:43:37 +0200
commit70a4a971f4b46e80d288abe413adb6e2876d8f71 (patch)
tree8313800debeee1939bdea06a6aabb8713ab035ec
parent21489acffebbcb2663e8a15e988f8902c4e689e6 (diff)
downloadceph-70a4a971f4b46e80d288abe413adb6e2876d8f71.tar.gz
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>
-rw-r--r--src/mds/Server.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index d97047d6d49..c9fac424f6f 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;