From: Mykola Golub <mgolub@mirantis.com>
Date: Mon, 27 Jun 2016 11:45:02 +0000 (+0300)
Subject: librbd: potential use after free on refresh error
X-Git-Tag: v10.2.3~92^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f19dbd0f092390b44acfb5fe9dc3936c6732fdd;p=ceph.git

librbd: potential use after free on refresh error

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit e92b3950cd261d36de422ccaa4a2441d41c80d0c)
---

diff --git a/src/librbd/AioImageRequestWQ.cc b/src/librbd/AioImageRequestWQ.cc
index fba79339fb74..22ad36427356 100644
--- a/src/librbd/AioImageRequestWQ.cc
+++ b/src/librbd/AioImageRequestWQ.cc
@@ -460,9 +460,8 @@ void AioImageRequestWQ::handle_refreshed(int r, AioImageRequest<> *req) {
                  << "req=" << req << dendl;
   if (r < 0) {
     req->fail(r);
-    delete req;
-
     finish_queued_op(req);
+    delete req;
     finish_in_flight_op();
   } else {
     // since IO was stalled for refresh -- original IO order is preserved