From: John Spray <john.spray@redhat.com>
Date: Mon, 6 Feb 2017 11:31:44 +0000 (+0000)
Subject: mds: fix bad iterator dereference reported by coverity
X-Git-Tag: v12.0.1~399^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d42cbdfd7ab79b42e4fab930ae40f198fb87412;p=ceph.git

mds: fix bad iterator dereference reported by coverity

Fixes: http://tracker.ceph.com/issues/18830
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 95a1f24d08ce..79da56f43b2f 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -471,7 +471,7 @@ bool Locker::acquire_locks(MDRequestRef& mdr,
     }
     
     // hose any stray locks
-    if (*existing == *p) {
+    if (existing != mdr->locks.end() && *existing == *p) {
       assert(need_wrlock || need_remote_wrlock);
       SimpleLock *lock = *existing;
       if (mdr->wrlocks.count(lock)) {