Merge pull request #11112 from dillaman/wip-17289

librbd: corrected use-after-free in ImageWatcher Reviewed-by: Mykola Golub <mgolub@mirantis.com>
ceph · Sep 17, 2016 · 3985ee2 · 3985ee2
2 parents 19acda7 + 2f4d486
commit 3985ee2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc
@@ -62,9 +62,10 @@ struct C_UnwatchAndFlush : public Context {
     // to completing the callback to avoid racing an explicit
     // librados shutdown
     Context *ctx = on_finish;
+    r = ret_val;
     delete this;
 
-    ctx->complete(ret_val);
+    ctx->complete(r);
   }
 
   virtual void finish(int r) override {