[PATCH v2 24/34] staging: mt7621-mmc: Fix memory leek in case of error in probe

Christian Lütke-Stetzkamp christian at lkamp.de
Wed Apr 4 20:15:33 UTC 2018


If the base address is not successfully obtained in the probe
function, then the mmc_host struct is not freed. Adding an exit for
that case fixes the bug.

Signed-off-by: Christian Lütke-Stetzkamp <christian at lkamp.de>
---
 drivers/staging/mt7621-mmc/sd.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index 5f829f79bfff..065d1b34c258 100644
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -2719,8 +2719,10 @@ static int msdc_drv_probe(struct platform_device *pdev)
 	//BUG_ON((!hw) || (!mem) || (irq < 0)); /* --- by chhung */
 
 	base = devm_ioremap_resource(&pdev->dev, res);
-	if (IS_ERR(base))
-		return PTR_ERR(base);
+	if (IS_ERR(base)) {
+		ret = PTR_ERR(base);
+		goto host_free;
+	}
 
 	/* Set host parameters to mmc */
 	mmc->ops        = &mt_msdc_ops;
@@ -2861,6 +2863,7 @@ static int msdc_drv_probe(struct platform_device *pdev)
 	if (mem)
 		release_mem_region(mem->start, mem->end - mem->start + 1);
 
+host_free:
 	mmc_free_host(mmc);
 
 	return ret;
-- 
2.16.1



More information about the devel mailing list