2022-02-07 14:47:57

by Christophe JAILLET

Subject: [PATCH] misc: alcor_pci: Fix an error handling path

A successful ida_simple_get() should be balanced by a corresponding
ida_simple_remove().

Add the missing call in the error handling path of the probe.

While at it, switch to ida_alloc()/ida_free() instead to
ida_simple_get()/ida_simple_remove().
The latter is deprecated and more verbose.

Fixes: 4f556bc04e3c ("misc: cardreader: add new Alcor Micro Cardreader PCI driver")
Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/misc/cardreader/alcor_pci.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/cardreader/alcor_pci.c b/drivers/misc/cardreader/alcor_pci.c
index de6d44a158bb..3f514d77a843 100644
--- a/drivers/misc/cardreader/alcor_pci.c
+++ b/drivers/misc/cardreader/alcor_pci.c
@@ -266,7 +266,7 @@ static int alcor_pci_probe(struct pci_dev *pdev,
if (!priv)
return -ENOMEM;

- ret = ida_simple_get(&alcor_pci_idr, 0, 0, GFP_KERNEL);
+ ret = ida_alloc(&alcor_pci_idr, GFP_KERNEL);
if (ret < 0)
return ret;
priv->id = ret;
@@ -280,7 +280,8 @@ static int alcor_pci_probe(struct pci_dev *pdev,
ret = pci_request_regions(pdev, DRV_NAME_ALCOR_PCI);
if (ret) {
dev_err(&pdev->dev, "Cannot request region\n");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto error_free_ida;
}

if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
@@ -324,6 +325,8 @@ static int alcor_pci_probe(struct pci_dev *pdev,

error_release_regions:
pci_release_regions(pdev);
+error_free_ida:
+ ida_free(&alcor_pci_idr, priv->id);
return ret;
}

@@ -337,7 +340,7 @@ static void alcor_pci_remove(struct pci_dev *pdev)

mfd_remove_devices(&pdev->dev);

- ida_simple_remove(&alcor_pci_idr, priv->id);
+ ida_free(&alcor_pci_idr, priv->id);

pci_release_regions(pdev);
pci_set_drvdata(pdev, NULL);
--
2.32.0

2022-02-08 13:19:48

by Oleksij Rempel

Subject: Re: [PATCH] misc: alcor_pci: Fix an error handling path

On Sun, Feb 06, 2022 at 09:39:54AM +0100, Christophe JAILLET wrote:
> A successful ida_simple_get() should be balanced by a corresponding
> ida_simple_remove().
>
> Add the missing call in the error handling path of the probe.
>
> While at it, switch to ida_alloc()/ida_free() instead to
> ida_simple_get()/ida_simple_remove().
> The latter is deprecated and more verbose.
>
> Fixes: 4f556bc04e3c ("misc: cardreader: add new Alcor Micro Cardreader PCI driver")
> Signed-off-by: Christophe JAILLET <[email protected]>

Reviewed-by: Oleksij Rempel <[email protected]>

Thank you!

> ---
> drivers/misc/cardreader/alcor_pci.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/misc/cardreader/alcor_pci.c b/drivers/misc/cardreader/alcor_pci.c
> index de6d44a158bb..3f514d77a843 100644
> --- a/drivers/misc/cardreader/alcor_pci.c
> +++ b/drivers/misc/cardreader/alcor_pci.c
> @@ -266,7 +266,7 @@ static int alcor_pci_probe(struct pci_dev *pdev,
> if (!priv)
> return -ENOMEM;
>
> - ret = ida_simple_get(&alcor_pci_idr, 0, 0, GFP_KERNEL);
> + ret = ida_alloc(&alcor_pci_idr, GFP_KERNEL);
> if (ret < 0)
> return ret;
> priv->id = ret;
> @@ -280,7 +280,8 @@ static int alcor_pci_probe(struct pci_dev *pdev,
> ret = pci_request_regions(pdev, DRV_NAME_ALCOR_PCI);
> if (ret) {
> dev_err(&pdev->dev, "Cannot request region\n");
> - return -ENOMEM;
> + ret = -ENOMEM;
> + goto error_free_ida;
> }
>
> if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
> @@ -324,6 +325,8 @@ static int alcor_pci_probe(struct pci_dev *pdev,
>
> error_release_regions:
> pci_release_regions(pdev);
> +error_free_ida:
> + ida_free(&alcor_pci_idr, priv->id);
> return ret;
> }
>
> @@ -337,7 +340,7 @@ static void alcor_pci_remove(struct pci_dev *pdev)
>
> mfd_remove_devices(&pdev->dev);
>
> - ida_simple_remove(&alcor_pci_idr, priv->id);
> + ida_free(&alcor_pci_idr, priv->id);
>
> pci_release_regions(pdev);
> pci_set_drvdata(pdev, NULL);
> --
> 2.32.0
>
>

--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |