diff mbox

mmc/core: free mmc_card when cmd 3,9,7 got failed in mmc_sd_init_card

Message ID 1374042070-32765-1-git-send-email-wei_wang@realsil.com.cn (mailing list archive)
State New, archived
Headers show

Commit Message

wei_wang@realsil.com.cn July 17, 2013, 6:21 a.m. UTC 
From: Wei WANG <wei_wang@realsil.com.cn>

In function mmc_sd_init_card, if command 3/9/7 got failed, mmc_card
allocated just before won't be freed. This would cause memory leak.

Signed-off-by: Wei WANG <wei_wang@realsil.com.cn>
---
 drivers/mmc/core/sd.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Chris Ball Aug. 25, 2013, 2:53 a.m. UTC | #1 
Hi Wei,

On Wed, Jul 17 2013, wei_wang@realsil.com.cn wrote:
> From: Wei WANG <wei_wang@realsil.com.cn>
>
> In function mmc_sd_init_card, if command 3/9/7 got failed, mmc_card
> allocated just before won't be freed. This would cause memory leak.
>
> Signed-off-by: Wei WANG <wei_wang@realsil.com.cn>
> ---
>  drivers/mmc/core/sd.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
> index 176d125..1240a85 100644
> --- a/drivers/mmc/core/sd.c
> +++ b/drivers/mmc/core/sd.c
> @@ -942,13 +942,13 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
>  	if (!mmc_host_is_spi(host)) {
>  		err = mmc_send_relative_addr(host, &card->rca);
>  		if (err)
> -			return err;
> +			goto free_card;
>  	}
>  
>  	if (!oldcard) {
>  		err = mmc_sd_get_csd(host, card);
>  		if (err)
> -			return err;
> +			goto free_card;
>  
>  		mmc_decode_cid(card);
>  	}
> @@ -959,7 +959,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
>  	if (!mmc_host_is_spi(host)) {
>  		err = mmc_select_card(card);
>  		if (err)
> -			return err;
> +			goto free_card;
>  	}
>  
>  	err = mmc_sd_setup_card(host, card, oldcard != NULL);

Thanks, pushed to mmc-next for 3.12.

- Chris.
diff mbox

Patch

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 176d125..1240a85 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -942,13 +942,13 @@  static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
 	if (!mmc_host_is_spi(host)) {
 		err = mmc_send_relative_addr(host, &card->rca);
 		if (err)
-			return err;
+			goto free_card;
 	}
 
 	if (!oldcard) {
 		err = mmc_sd_get_csd(host, card);
 		if (err)
-			return err;
+			goto free_card;
 
 		mmc_decode_cid(card);
 	}
@@ -959,7 +959,7 @@  static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
 	if (!mmc_host_is_spi(host)) {
 		err = mmc_select_card(card);
 		if (err)
-			return err;
+			goto free_card;
 	}
 
 	err = mmc_sd_setup_card(host, card, oldcard != NULL);