NVMe: Free admin queue on request_irq error

Fixes a potential memory leak if requesting the admin queue irq fails.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 358d177..391a874 100644 (file)
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1054,14 +1054,19 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
                }
        }
 
-       if (result) {
-               nvme_free_queue_mem(nvmeq);
-               return result;
-       }
+       if (result)
+               goto free_q;
 
        result = queue_request_irq(dev, nvmeq, "nvme admin");
+       if (result)
+               goto free_q;
+
        dev->queues[0] = nvmeq;
        return result;
+
+ free_q:
+       nvme_free_queue_mem(nvmeq);
+       return result;
 }
 
 struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write,