len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jz4740: Fix potential deadlock in SD init code.

Browse source 
There's a code path that calls sd_init_device() while we hold sd_mtx, but
sd_init_device() tries to obtain the mutex while doing its work.

Change-Id: I882c595e9e7cd2224b1db0d413925668628476e9
This commit is contained in:
Solomon Peachy 2020-08-25 07:59:34 -04:00
parent 63ef81de31
commit 1b31101fdd
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c
View file

@ -1184,13 +1184,11 @@ static int sd_select_card(void)
return 0; return 0;
} }
static int sd_init_device(void) static int __sd_init_device(void)
{ {
int retval; int retval;
struct sd_request init_req; struct sd_request init_req;
mutex_lock(&sd_mtx);
/* Initialise card data as blank */ /* Initialise card data as blank */
memset(&card, 0, sizeof(tCardInfo)); memset(&card, 0, sizeof(tCardInfo));
@ -1210,7 +1208,6 @@ static int sd_init_device(void)
retval = (retval == SD_INIT_PASSED ? sd_select_card() : -1); retval = (retval == SD_INIT_PASSED ? sd_select_card() : -1);
__cpm_stop_msc(); /* disable SD clock */ __cpm_stop_msc(); /* disable SD clock */
mutex_unlock(&sd_mtx);
return retval; return retval;
} }
@ -1225,7 +1222,11 @@ int sd_init(void)
inited = true; inited = true;
} }
return sd_init_device(); mutex_lock(&sd_mtx);
int ret = __sd_init_device();
mutex_unlock(&sd_mtx);
return ret;
} }
static inline bool card_detect_target(void) static inline bool card_detect_target(void)
@ -1267,7 +1268,7 @@ int sd_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf)
if (!card_detect_target() || count == 0 || start > card.numblocks) if (!card_detect_target() || count == 0 || start > card.numblocks)
goto err; goto err;
if(card.initialized == 0 && !sd_init_device()) if(card.initialized == 0 && !__sd_init_device())
goto err; goto err;
sd_simple_cmd(&request, SD_SEND_STATUS, card.rca, RESPONSE_R1); sd_simple_cmd(&request, SD_SEND_STATUS, card.rca, RESPONSE_R1);
@ -1321,7 +1322,7 @@ int sd_write_sectors(IF_MV(int drive,) unsigned long start, int count, const voi
if (!card_detect_target() || count == 0 || start > card.numblocks) if (!card_detect_target() || count == 0 || start > card.numblocks)
goto err; goto err;
if(card.initialized == 0 && !sd_init_device()) if(card.initialized == 0 && !__sd_init_device())
goto err; goto err;
sd_simple_cmd(&request, SD_SEND_STATUS, card.rca, RESPONSE_R1); sd_simple_cmd(&request, SD_SEND_STATUS, card.rca, RESPONSE_R1);