* [PATCH] mmc/core: free mmc_card when cmd 3,9,7 got failed in mmc_sd_init_card
@ 2013-07-17 6:21 wei_wang
2013-08-25 2:53 ` Chris Ball
0 siblings, 1 reply; 2+ messages in thread
From: wei_wang @ 2013-07-17 6:21 UTC (permalink / raw)
To: cjb; +Cc: devel, linux-mmc, Wei WANG
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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] mmc/core: free mmc_card when cmd 3,9,7 got failed in mmc_sd_init_card
2013-07-17 6:21 [PATCH] mmc/core: free mmc_card when cmd 3,9,7 got failed in mmc_sd_init_card wei_wang
@ 2013-08-25 2:53 ` Chris Ball
0 siblings, 0 replies; 2+ messages in thread
From: Chris Ball @ 2013-08-25 2:53 UTC (permalink / raw)
To: wei_wang; +Cc: devel, linux-mmc
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.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-25 2:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-17 6:21 [PATCH] mmc/core: free mmc_card when cmd 3,9,7 got failed in mmc_sd_init_card wei_wang
2013-08-25 2:53 ` Chris Ball
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.