From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 9 Sep 2016 12:31:52 +0000 (-0400)
Subject: librbd: potential seg fault when blacklisting an image client
X-Git-Tag: v11.0.1~274^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11034%2Fhead;p=ceph.git

librbd: potential seg fault when blacklisting an image client

Fixes: http://tracker.ceph.com/issues/17251
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/image_watcher/RewatchRequest.cc b/src/librbd/image_watcher/RewatchRequest.cc
index 4d808f459c5d..cbf22c07087e 100644
--- a/src/librbd/image_watcher/RewatchRequest.cc
+++ b/src/librbd/image_watcher/RewatchRequest.cc
@@ -56,6 +56,7 @@ void RewatchRequest<I>::handle_unwatch(int r) {
   if (r == -EBLACKLISTED) {
     lderr(cct) << "client blacklisted" << dendl;
     finish(r);
+    return;
   } else if (r < 0) {
     lderr(cct) << "failed to unwatch: " << cpp_strerror(r) << dendl;
   }