From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 9 Jan 2017 22:40:42 +0000 (-0500)
Subject: librbd: potential nullptr dereference in ManagedLock
X-Git-Tag: v12.0.0~225^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12846%2Fhead;p=ceph.git

librbd: potential nullptr dereference in ManagedLock

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/ManagedLock.cc b/src/librbd/ManagedLock.cc
index 17a0fb81142e..c5dead596170 100644
--- a/src/librbd/ManagedLock.cc
+++ b/src/librbd/ManagedLock.cc
@@ -105,7 +105,9 @@ void ManagedLock<I>::acquire_lock(Context *on_acquired) {
     }
   }
 
-  on_acquired->complete(r);
+  if (on_acquired != nullptr) {
+    on_acquired->complete(r);
+  }
 }
 
 template <typename I>
@@ -122,7 +124,9 @@ void ManagedLock<I>::try_acquire_lock(Context *on_acquired) {
     }
   }
 
-  on_acquired->complete(r);
+  if (on_acquired != nullptr) {
+    on_acquired->complete(r);
+  }
 }
 
 template <typename I>
@@ -139,7 +143,9 @@ void ManagedLock<I>::release_lock(Context *on_released) {
     }
   }
 
-  on_released->complete(r);
+  if (on_released != nullptr) {
+    on_released->complete(r);
+  }
 }
 
 template <typename I>