From: Sam Bradshaw <sbradshaw@micron.com>
Date: Wed, 10 Dec 2014 20:00:31 +0000 (-0700)
Subject: NVMe: fix freeing of wrong request in abort path
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c87fd5407e1aa1cfc6b393b03bf67010cf643dbe;p=deliverable%2Flinux.git

NVMe: fix freeing of wrong request in abort path

We allocate 'abort_req', but free 'req' in case of an error
submitting the IO.

Signed-off-by: Sam Bradshaw <sbradshaw@micron.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index bcbdf832b1b0..cf9b8a8a24d3 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1053,7 +1053,7 @@ static void nvme_abort_req(struct request *req)
 		dev_warn(nvmeq->q_dmadev,
 				"Could not abort I/O %d QID %d",
 				req->tag, nvmeq->qid);
-		blk_mq_free_request(req);
+		blk_mq_free_request(abort_req);
 	}
 }