diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 12:23:02 +0100 |
|---|---|---|
| committer | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 12:23:02 +0100 |
| commit | 7e492d8258182e31c988bbf9917d4a3d41949d56 (patch) | |
| tree | e9c9db79d797cf487107c019537c6bb00b854c6c /fs | |
| parent | afe45c87e3c5d77bad76b1a57dccd20764d45b5d (diff) | |
| parent | 30f1806f60978d707b0cff2d7bf89d141fc24290 (diff) | |
| download | u-boot-imx-7e492d8258182e31c988bbf9917d4a3d41949d56.zip u-boot-imx-7e492d8258182e31c988bbf9917d4a3d41949d56.tar.gz u-boot-imx-7e492d8258182e31c988bbf9917d4a3d41949d56.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot into new-image
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext2/dev.c | 16 | ||||
| -rw-r--r-- | fs/fat/fat.c | 8 |
2 files changed, 20 insertions, 4 deletions
diff --git a/fs/ext2/dev.c b/fs/ext2/dev.c index 643a1a8..1728b34 100644 --- a/fs/ext2/dev.c +++ b/fs/ext2/dev.c @@ -96,8 +96,23 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) { sector++; } + if (byte_len == 0) + return 1; + /* read sector aligned part */ block_len = byte_len & ~(SECTOR_SIZE - 1); + + if (block_len == 0) { + u8 p[SECTOR_SIZE]; + + block_len = SECTOR_SIZE; + ext2fs_block_dev_desc->block_read(ext2fs_block_dev_desc->dev, + part_info.start + sector, + 1, (unsigned long *)p); + memcpy(buf, p, byte_len); + return 1; + } + if (ext2fs_block_dev_desc->block_read (ext2fs_block_dev_desc->dev, part_info.start + sector, block_len / SECTOR_SIZE, @@ -106,6 +121,7 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) { printf (" ** ext2fs_devread() read error - block\n"); return (0); } + block_len = byte_len & ~(SECTOR_SIZE - 1); buf += block_len; byte_len -= block_len; sector += block_len / SECTOR_SIZE; diff --git a/fs/fat/fat.c b/fs/fat/fat.c index c1e5741..49c78ed 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -352,7 +352,7 @@ get_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer, newclust = get_fatent(mydata, endclust); if((newclust -1)!=endclust) goto getit; - if (newclust <= 0x0001 || newclust >= 0xfff0) { + if (CHECK_CLUST(newclust, mydata->fatsize)) { FAT_DPRINT("curclust: 0x%x\n", newclust); FAT_DPRINT("Invalid FAT entry\n"); return gotsize; @@ -387,7 +387,7 @@ getit: filesize -= actsize; buffer += actsize; curclust = get_fatent(mydata, endclust); - if (curclust <= 0x0001 || curclust >= 0xfff0) { + if (CHECK_CLUST(curclust, mydata->fatsize)) { FAT_DPRINT("curclust: 0x%x\n", curclust); FAT_ERROR("Invalid FAT entry\n"); return gotsize; @@ -459,7 +459,7 @@ get_vfatname(fsdata *mydata, int curclust, __u8 *cluster, slotptr--; curclust = get_fatent(mydata, curclust); - if (curclust <= 0x0001 || curclust >= 0xfff0) { + if (CHECK_CLUST(curclust, mydata->fatsize)) { FAT_DPRINT("curclust: 0x%x\n", curclust); FAT_ERROR("Invalid FAT entry\n"); return -1; @@ -652,7 +652,7 @@ static dir_entry *get_dentfromdir (fsdata * mydata, int startsect, return retdent; } curclust = get_fatent (mydata, curclust); - if (curclust <= 0x0001 || curclust >= 0xfff0) { + if (CHECK_CLUST(curclust, mydata->fatsize)) { FAT_DPRINT ("curclust: 0x%x\n", curclust); FAT_ERROR ("Invalid FAT entry\n"); return NULL; |