devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

as3525: make sure we don't use a negative number of sectors

Browse source 
Better be safe than sorry, don't try to read/write outside our storage,
because we might overwrite the OF on the internal storage

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26077 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-05-16 10:24:31 +00:00
parent f95a982dcf
commit c785722fec
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
firmware/target/arm/as3525/sd-as3525.c
View file

@ -682,11 +682,16 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
goto sd_transfer_error; goto sd_transfer_error;
} }
if((start+count) > card_info[drive].numblocks) if(count < 0) /* XXX: why is it signed ? */
{ {
ret = -20; ret = -20;
goto sd_transfer_error; goto sd_transfer_error;
} }
if((start+count) > card_info[drive].numblocks)
{
ret = -21;
goto sd_transfer_error;
}
/* skip SanDisk OF */ /* skip SanDisk OF */
if (drive == INTERNAL_AS3525) if (drive == INTERNAL_AS3525)

11
firmware/target/arm/as3525/sd-as3525v2.c
View file

@ -809,11 +809,16 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
} }
} }
if((start+count) > card_info[drive].numblocks) if(count < 0) /* XXX: why is it signed ? */
{ {
ret = -18; ret = -18;
goto sd_transfer_error; goto sd_transfer_error;
} }
if((start+count) > card_info[drive].numblocks)
{
ret = -19;
goto sd_transfer_error;
}
/* skip SanDisk OF */ /* skip SanDisk OF */
if (drive == INTERNAL_AS3525) if (drive == INTERNAL_AS3525)
@ -821,7 +826,7 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
/* CMD7 w/rca: Select card to put it in TRAN state */ /* CMD7 w/rca: Select card to put it in TRAN state */
if(!send_cmd(drive, SD_SELECT_CARD, card_info[drive].rca, MCI_NO_RESP, NULL)) if(!send_cmd(drive, SD_SELECT_CARD, card_info[drive].rca, MCI_NO_RESP, NULL))
return -19; return -20;
last_disk_activity = current_tick; last_disk_activity = current_tick;
dma_retain(); dma_retain();
@ -911,7 +916,7 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
/* CMD lines are separate, not common, so we need to actively deselect */ /* CMD lines are separate, not common, so we need to actively deselect */
/* CMD7 w/rca =0 : deselects card & puts it in STBY state */ /* CMD7 w/rca =0 : deselects card & puts it in STBY state */
if(!send_cmd(drive, SD_DESELECT_CARD, 0, MCI_NO_RESP, NULL)) if(!send_cmd(drive, SD_DESELECT_CARD, 0, MCI_NO_RESP, NULL))
return -20; return -21;
#ifndef BOOTLOADER #ifndef BOOTLOADER
sd_enable(false); sd_enable(false);