LinuxLists.cc - [PATCH] crypto: ccp - Fix a resource leak in an error handling path

2021-05-16 10:19:59

Subject: [PATCH] crypto: ccp - Fix a resource leak in an error handling path

If an error occurs after calling 'sp_get_irqs()', 'sp_free_irqs()' must be
called as already done in the error handling path.

Fixes: f4d18d656f88 ("crypto: ccp - Abstract interrupt registeration")
Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/crypto/ccp/sp-pci.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
index f468594ef8af..6fb6ba35f89d 100644
--- a/drivers/crypto/ccp/sp-pci.c
+++ b/drivers/crypto/ccp/sp-pci.c
@@ -222,7 +222,7 @@ static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (ret) {
dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n",
ret);
- goto e_err;
+ goto free_irqs;
}
}

@@ -230,10 +230,12 @@ static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

ret = sp_init(sp);
if (ret)
- goto e_err;
+ goto free_irqs;

return 0;

+free_irqs:
+ sp_free_irqs(sp);
e_err:
dev_notice(dev, "initialization failed\n");
return ret;
--
2.30.2

2021-05-19 20:56:51

by John Allen

[permalink] [raw]

Subject: Re: [PATCH] crypto: ccp - Fix a resource leak in an error handling path

On Sun, May 16, 2021 at 08:58:04AM +0200, Christophe JAILLET wrote:
> If an error occurs after calling 'sp_get_irqs()', 'sp_free_irqs()' must be
> called as already done in the error handling path.
>
> Fixes: f4d18d656f88 ("crypto: ccp - Abstract interrupt registeration")
> Signed-off-by: Christophe JAILLET <[email protected]>

Acked-by: John Allen <[email protected]>

> ---
> drivers/crypto/ccp/sp-pci.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
> index f468594ef8af..6fb6ba35f89d 100644
> --- a/drivers/crypto/ccp/sp-pci.c
> +++ b/drivers/crypto/ccp/sp-pci.c
> @@ -222,7 +222,7 @@ static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> if (ret) {
> dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n",
> ret);
> - goto e_err;
> + goto free_irqs;
> }
> }
>
> @@ -230,10 +230,12 @@ static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
>
> ret = sp_init(sp);
> if (ret)
> - goto e_err;
> + goto free_irqs;
>
> return 0;
>
> +free_irqs:
> + sp_free_irqs(sp);
> e_err:
> dev_notice(dev, "initialization failed\n");
> return ret;
> --
> 2.30.2
>

2021-05-21 10:29:49

by Herbert Xu

[permalink] [raw]