MagnitudeOS/littlefs
1
0
Fork 0
forked from Imagelibrary/littlefs
Code Pull Requests Activity

Add a unit test; currently hanging on final permutation.

Browse Source 
Some block-device bound-checks are disabled during superblock search.
This commit is contained in:
Brian Pugh
2023-08-16 23:07:55 -07:00
parent be6812213d
commit df238ebac6
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lfs.c
View File

@@ -46,8 +46,8 @@ static int lfs_bd_read(lfs_t *lfs,
lfs_block_t block, lfs_off_t off,
void *buffer, lfs_size_t size) {
uint8_t *data = buffer;
if (block >= lfs->block_count ||
off+size > lfs->cfg->block_size) {
if (lfs->block_count &&
(block >= lfs->block_count || off+size > lfs->cfg->block_size)) {
return LFS_ERR_CORRUPT;
}
@@ -104,7 +104,7 @@ static int lfs_bd_read(lfs_t *lfs,
}
// load to cache, first condition can no longer fail
LFS_ASSERT(block < lfs->block_count);
LFS_ASSERT(!lfs->block_count || block < lfs->block_count);
rcache->block = block;
rcache->off = lfs_aligndown(off, lfs->cfg->read_size);
rcache->size = lfs_min(
@@ -4389,7 +4389,7 @@ static int lfs_validate_superblock(lfs_t *lfs, lfs_superblock_t *superblock){
lfs->attr_max = superblock->attr_max;
}
if (superblock->block_count != lfs->cfg->block_count) {
if (lfs->cfg->block_count && superblock->block_count != lfs->cfg->block_count) {
LFS_ERROR("Invalid block count (%"PRIu32" != %"PRIu32")",
superblock->block_count, lfs->cfg->block_count);
return LFS_ERR_INVAL;