WIP bug fixed found in CI

littlefs-project · Dec 6, 2022 · aa23e01 · aa23e01
1 parent efc4e18
commit aa23e01
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lfs.c b/lfs.c
@@ -4087,7 +4087,7 @@ static int lfs_init(lfs_t *lfs, const struct lfs_config *cfg) {
         lfs->attr_max = LFS_ATTR_MAX;
     }
 
-    LFS_ASSERT(lfs->cfg->metadata_max <= lfs->block_size);
+    LFS_ASSERT(lfs->cfg->metadata_max <= lfs->cfg->block_size);
 
     // setup default state
     lfs->root[0] = LFS_BLOCK_NULL;
@@ -4846,6 +4846,7 @@ static int lfs_fs_rawstat(lfs_t *lfs, struct lfs_fsinfo *fsinfo) {
     return 0;
 }
 
+#ifndef LFS_READONLY
 int lfs_fs_rawgrow(lfs_t *lfs, lfs_size_t block_count) {
     // shrinking is not supported
     LFS_ASSERT(block_count >= lfs->block_count);
@@ -4882,6 +4883,7 @@ int lfs_fs_rawgrow(lfs_t *lfs, lfs_size_t block_count) {
 
     return 0;
 }
+#endif
 
 #ifdef LFS_MIGRATE
 ////// Migration from littelfs v1 below this //////
@@ -5057,7 +5059,7 @@ static int lfs1_dir_fetch(lfs_t *lfs,
         }
 
         if ((0x7fffffff & test.size) < sizeof(test)+4 ||
-            (0x7fffffff & test.size) > lfs->block_size) {
+            (0x7fffffff & test.size) > lfs->cfg->block_size) {
             continue;
         }
 
@@ -5491,8 +5493,8 @@ static int lfs_rawmigrate(lfs_t *lfs, const struct lfs_config *cfg) {
 
         lfs_superblock_t superblock = {
             .version     = LFS_DISK_VERSION,
-            .block_size  = lfs->block_size,
-            .block_count = lfs->block_count,
+            .block_size  = lfs->cfg->block_size,
+            .block_count = lfs->cfg->block_count,
             .name_max    = lfs->name_max,
             .file_max    = lfs->file_max,
             .attr_max    = lfs->attr_max,

diff --git a/tests/test_evil.toml b/tests/test_evil.toml
@@ -237,7 +237,7 @@ code = '''
     lfs_dir_fetch(&lfs, &mdir, (lfs_block_t[2]){0, 1}) => 0;
     lfs_dir_commit(&lfs, &mdir, LFS_MKATTRS(
             {LFS_MKTAG(LFS_TYPE_HARDTAIL, 0x3ff, 8),
-                (lfs_block_t[2]){0, 1}})) => 0;
+                (lfs_block_t[2]){lfs_tole32(0), lfs_tole32(1)}})) => 0;
     lfs_deinit(&lfs) => 0;
 
     // test that mount fails gracefully
@@ -268,7 +268,7 @@ code = '''
     lfs_dir_fetch(&lfs, &mdir, pair) => 0;
     lfs_dir_commit(&lfs, &mdir, LFS_MKATTRS(
             {LFS_MKTAG(LFS_TYPE_HARDTAIL, 0x3ff, 8),
-                (lfs_block_t[2]){0, 1}})) => 0;
+                (lfs_block_t[2]){lfs_tole32(0), lfs_tole32(1)}})) => 0;
     lfs_deinit(&lfs) => 0;
 
     // test that mount fails gracefully
@@ -297,6 +297,7 @@ code = '''
     lfs_pair_fromle32(pair);
     // change tail-pointer to point to ourself
     lfs_dir_fetch(&lfs, &mdir, pair) => 0;
+    lfs_pair_tole32(pair);
     lfs_dir_commit(&lfs, &mdir, LFS_MKATTRS(
             {LFS_MKTAG(LFS_TYPE_HARDTAIL, 0x3ff, 8), pair})) => 0;
     lfs_deinit(&lfs) => 0;