lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: core: free mmc_card if cmd 3,9,7 fails in mmc_sd_init_card

Browse Source 
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>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Wei WANG
2013-07-17 14:21:10 +08:00
committed by Chris Ball
parent 0506bc57f5
commit 7fca96758e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/core/sd.c
View File

@@ -942,13 +942,13 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
if (!mmc_host_is_spi(host)) { if (!mmc_host_is_spi(host)) {
err = mmc_send_relative_addr(host, &card->rca); err = mmc_send_relative_addr(host, &card->rca);
if (err) if (err)
return err; goto free_card;
} }
if (!oldcard) { if (!oldcard) {
err = mmc_sd_get_csd(host, card); err = mmc_sd_get_csd(host, card);
if (err) if (err)
return err; goto free_card;
mmc_decode_cid(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)) { if (!mmc_host_is_spi(host)) {
err = mmc_select_card(card); err = mmc_select_card(card);
if (err) if (err)
return err; goto free_card;
} }
err = mmc_sd_setup_card(host, card, oldcard != NULL); err = mmc_sd_setup_card(host, card, oldcard != NULL);