leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs: Fix ext2 read issue

Browse Source 
The ext2 aligned process will corrupt the key
data struct, the patch fix this.

Signed-off-by: Dave Liu <daveliu@freescale.com>
This commit is contained in:
Dave Liu 2008-02-29 17:45:31 +08:00 committed by Wolfgang Denk
parent 5013c09f7a
commit ce1120dd70
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/ext2/dev.c
View File

@ -96,8 +96,23 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
sector++; sector++;
} }
if (byte_len == 0)
return 1;
/* read sector aligned part */ /* read sector aligned part */
block_len = byte_len & ~(SECTOR_SIZE - 1); 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, if (ext2fs_block_dev_desc->block_read (ext2fs_block_dev_desc->dev,
part_info.start + sector, part_info.start + sector,
block_len / SECTOR_SIZE, 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"); printf (" ** ext2fs_devread() read error - block\n");
return (0); return (0);
} }
block_len = byte_len & ~(SECTOR_SIZE - 1);
buf += block_len; buf += block_len;
byte_len -= block_len; byte_len -= block_len;
sector += block_len / SECTOR_SIZE; sector += block_len / SECTOR_SIZE;