[PATCH] nvme: fix controller instance leak

[PATCH] nvme: fix controller instance leak

[Keith Busch]

If the driver has to unbind from the controller for an early failure
before the subsystem has been set up, there won't be a subsystem holding
the controller's instance, so the controller needs to free its own
instance in this case.

Fixes: 733e4b69d508d ("nvme: Assign subsys instance from first ctrl")
Signed-off-by: Keith Busch <kbusch@kernel.org>
---
 drivers/nvme/host/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 154942fc64eb..be7c609b3d07 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4390,7 +4390,7 @@ static void nvme_free_ctrl(struct device *dev)
 	struct nvme_subsystem *subsys = ctrl->subsys;
 	struct nvme_cel *cel, *next;
 
-	if (subsys && ctrl->instance != subsys->instance)
+	if (!subsys || ctrl->instance != subsys->instance)
 		ida_simple_remove(&nvme_instance_ida, ctrl->instance);
 
 	list_for_each_entry_safe(cel, next, &ctrl->cels, entry) {
-- 
2.24.1


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

Re: [PATCH] nvme: fix controller instance leak

[Chaitanya Kulkarni]

On 8/26/20 11:01, Keith Busch wrote:
> If the driver has to unbind from the controller for an early failure
> before the subsystem has been set up, there won't be a subsystem holding
> the controller's instance, so the controller needs to free its own
> instance in this case.
> 
> Fixes: 733e4b69d508d ("nvme: Assign subsys instance from first ctrl")
> Signed-off-by: Keith Busch<kbusch@kernel.org>

Looks good.

Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

Re: [PATCH] nvme: fix controller instance leak

[Christoph Hellwig]

On Wed, Aug 26, 2020 at 10:53:04AM -0700, Keith Busch wrote:
> If the driver has to unbind from the controller for an early failure
> before the subsystem has been set up, there won't be a subsystem holding
> the controller's instance, so the controller needs to free its own
> instance in this case.
> 
> Fixes: 733e4b69d508d ("nvme: Assign subsys instance from first ctrl")
> Signed-off-by: Keith Busch <kbusch@kernel.org>

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme