| Message ID | 20200426202355.43055-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: alcor: Fix a resource leak in an error handling path in 'alcor_pci_sdmmc_drv_probe()' | expand |
On Sun, 26 Apr 2020 at 22:23, Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > > If 'devm_request_threaded_irq()' fails, resources allocated by > 'mmc_alloc_host()' must be freed. > > Fixes: c5413ad815a6 ("mmc: add new Alcor Micro Cardreader SD/MMC driver") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Applied for fixes, thanks! Kind regards Uffe > --- > drivers/mmc/host/alcor.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/alcor.c b/drivers/mmc/host/alcor.c > index 1aee485d56d4..026ca9194ce5 100644 > --- a/drivers/mmc/host/alcor.c > +++ b/drivers/mmc/host/alcor.c > @@ -1104,7 +1104,7 @@ static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev) > > if (ret) { > dev_err(&pdev->dev, "Failed to get irq for data line\n"); > - return ret; > + goto free_host; > } > > mutex_init(&host->cmd_mutex); > @@ -1116,6 +1116,10 @@ static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev) > dev_set_drvdata(&pdev->dev, host); > mmc_add_host(mmc); > return 0; > + > +free_host: > + mmc_free_host(mmc); > + return ret; > } > > static int alcor_pci_sdmmc_drv_remove(struct platform_device *pdev) > -- > 2.25.1 >
diff --git a/drivers/mmc/host/alcor.c b/drivers/mmc/host/alcor.c index 1aee485d56d4..026ca9194ce5 100644 --- a/drivers/mmc/host/alcor.c +++ b/drivers/mmc/host/alcor.c @@ -1104,7 +1104,7 @@ static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Failed to get irq for data line\n"); - return ret; + goto free_host; } mutex_init(&host->cmd_mutex); @@ -1116,6 +1116,10 @@ static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, host); mmc_add_host(mmc); return 0; + +free_host: + mmc_free_host(mmc); + return ret; } static int alcor_pci_sdmmc_drv_remove(struct platform_device *pdev)
If 'devm_request_threaded_irq()' fails, resources allocated by 'mmc_alloc_host()' must be freed. Fixes: c5413ad815a6 ("mmc: add new Alcor Micro Cardreader SD/MMC driver") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/mmc/host/alcor.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)