2022-08-10 07:19:57

by Bo Liu

Subject: [PATCH] nvdimm: Call ida_simple_remove() when failed

In function nvdimm_bus_register(), when code execution fails, we should
call ida_simple_remove() to free ida.

Signed-off-by: Bo Liu <[email protected]>
---
drivers/nvdimm/bus.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index b38d0355b0ac..3415dc62632b 100644
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -371,6 +371,7 @@ struct nvdimm_bus *nvdimm_bus_register(struct device *parent,
return nvdimm_bus;
err:
put_device(&nvdimm_bus->dev);
+ ida_simple_remove(&nd_ida, nvdimm_bus->id);
return NULL;
}
EXPORT_SYMBOL_GPL(nvdimm_bus_register);
--
2.27.0

2022-09-20 18:03:49

by Dan Williams

Subject: RE: [PATCH] nvdimm: Call ida_simple_remove() when failed

Bo Liu wrote:
> In function nvdimm_bus_register(), when code execution fails, we should
> call ida_simple_remove() to free ida.
>
> Signed-off-by: Bo Liu <[email protected]>
> ---
> drivers/nvdimm/bus.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
> index b38d0355b0ac..3415dc62632b 100644
> --- a/drivers/nvdimm/bus.c
> +++ b/drivers/nvdimm/bus.c
> @@ -371,6 +371,7 @@ struct nvdimm_bus *nvdimm_bus_register(struct device *parent,
> return nvdimm_bus;
> err:
> put_device(&nvdimm_bus->dev);
> + ida_simple_remove(&nd_ida, nvdimm_bus->id);

No, this is a double-free. The put_device() will trigger
nvdimm_bus_release().