Fixed some more LFS_TRACE format specifiers

- block_cycles is signed and should use PRId32
- flags is signed (which is a bit weird) and should be cast for %x

Unfortunately exactly what PRI* expands to is dependant on both the
compiler and the underlying architecture, so I don't think it's possible
for us to catch these mistakes with CI...

Found by stefano-zanotti

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       github.event.workflow_run.head_sha == github.sha}}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           ref: ${{github.event.workflow_run.head_sha}}
           # need workflow access since we push branches
@@ -30,29 +30,26 @@ jobs:
           fetch-depth: 0
 
       # try to get results from tests
-      - uses: actions/download-artifact@v4
+      - uses: dawidd6/action-download-artifact@v2
         continue-on-error: true
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          run-id: ${{github.event.workflow_run.id}}
-          pattern: '{sizes,sizes-*}'
-          merge-multiple: true
+          workflow: ${{github.event.workflow_run.name}}
+          run_id: ${{github.event.workflow_run.id}}
+          name: sizes
           path: sizes
-      - uses: actions/download-artifact@v4
+      - uses: dawidd6/action-download-artifact@v2
         continue-on-error: true
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          run-id: ${{github.event.workflow_run.id}}
-          pattern: '{cov,cov-*}'
-          merge-multiple: true
+          workflow: ${{github.event.workflow_run.name}}
+          run_id: ${{github.event.workflow_run.id}}
+          name: cov
           path: cov
-      - uses: actions/download-artifact@v4
+      - uses: dawidd6/action-download-artifact@v2
         continue-on-error: true
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          run-id: ${{github.event.workflow_run.id}}
-          pattern: '{bench,bench-*}'
-          merge-multiple: true
+          workflow: ${{github.event.workflow_run.name}}
+          run_id: ${{github.event.workflow_run.id}}
+          name: bench
           path: bench
 
       - name: find-version

.github/workflows/status.yml

@@ -13,13 +13,12 @@ jobs:
   status:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: dawidd6/action-download-artifact@v2
         continue-on-error: true
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          run-id: ${{github.event.workflow_run.id}}
-          pattern: '{status,status-*}'
-          merge-multiple: true
+          workflow: ${{github.event.workflow_run.name}}
+          run_id: ${{github.event.workflow_run.id}}
+          name: status
           path: status
       - name: update-status
         continue-on-error: true
@@ -68,13 +67,12 @@ jobs:
 
     steps:
       # generated comment?
-      - uses: actions/download-artifact@v4
+      - uses: dawidd6/action-download-artifact@v2
         continue-on-error: true
         with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          run-id: ${{github.event.workflow_run.id}}
-          pattern: '{comment,comment-*}'
-          merge-multiple: true
+          workflow: ${{github.event.workflow_run.name}}
+          run_id: ${{github.event.workflow_run.id}}
+          name: comment
           path: comment
       - name: update-comment
         continue-on-error: true

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
         arch: [x86_64, thumb, mips, powerpc]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: install
         run: |
           # need a few things
@@ -235,9 +235,9 @@ jobs:
 
       # create size statuses
       - name: upload-sizes
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
-          name: sizes-${{matrix.arch}}
+          name: sizes
           path: sizes
       - name: status-sizes
         run: |
@@ -273,17 +273,16 @@ jobs:
             }' | tee status/$(basename $f .csv).json
           done
       - name: upload-status-sizes
-        if: ${{matrix.arch == 'x86_64'}}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
-          name: status-sizes-${{matrix.arch}}
+          name: status
           path: status
           retention-days: 1
 
       # create cov statuses
       - name: upload-cov
         if: ${{matrix.arch == 'x86_64'}}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: cov
           path: cov
@@ -318,11 +317,11 @@ jobs:
               target_step: env.STEP,
             }' | tee status/$(basename $f .csv)-$s.json
           done
-      - name: upload-status-cov
+      - name: upload-status-sizes
         if: ${{matrix.arch == 'x86_64'}}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
-          name: status-cov
+          name: status
           path: status
           retention-days: 1
 
@@ -337,7 +336,7 @@ jobs:
         pls: [1, 2]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: install
         run: |
           # need a few things
@@ -362,7 +361,7 @@ jobs:
   test-no-intrinsics:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: install
         run: |
           # need a few things
@@ -379,7 +378,7 @@ jobs:
   test-multiversion:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: install
         run: |
           # need a few things
@@ -396,7 +395,7 @@ jobs:
   test-lfs2_0:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: install
         run: |
           # need a few things
@@ -415,7 +414,7 @@ jobs:
   test-valgrind:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: install
         run: |
           # need a few things
@@ -437,7 +436,7 @@ jobs:
   test-clang:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: install
         run: |
           # need a few things
@@ -460,7 +459,7 @@ jobs:
   bench:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: install
         run: |
           # need a few things
@@ -492,7 +491,7 @@ jobs:
 
       # create bench statuses
       - name: upload-bench
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: bench
           path: bench
@@ -526,9 +525,9 @@ jobs:
             }' | tee status/$(basename $f .csv)-$s.json
           done
       - name: upload-status-bench
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
-          name: status-bench
+          name: status
           path: status
           retention-days: 1
 
@@ -536,10 +535,10 @@ jobs:
   test-compat:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         if: ${{github.event_name == 'pull_request'}}
       # checkout the current pr target into lfsp
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         if: ${{github.event_name == 'pull_request'}}
         with:
           ref: ${{github.event.pull_request.base.ref}}
@@ -573,7 +572,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{!endsWith(github.ref, '-prefix')}}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: install
         run: |
           # need a few things
@@ -583,7 +582,7 @@ jobs:
           gcc --version
           python3 --version
           fusermount -V
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           repository: littlefs-project/littlefs-fuse
           ref: v2
@@ -623,7 +622,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{!endsWith(github.ref, '-prefix')}}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: install
         run: |
           # need a few things
@@ -633,12 +632,12 @@ jobs:
           gcc --version
           python3 --version
           fusermount -V
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           repository: littlefs-project/littlefs-fuse
           ref: v2
           path: v2
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           repository: littlefs-project/littlefs-fuse
           ref: v1
@@ -695,7 +694,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [test, bench]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         if: ${{github.event_name == 'pull_request'}}
       - name: install
         if: ${{github.event_name == 'pull_request'}}
@@ -705,26 +704,23 @@ jobs:
           pip3 install toml
           gcc --version
           python3 --version
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v2
         if: ${{github.event_name == 'pull_request'}}
         continue-on-error: true
         with:
-          pattern: '{sizes,sizes-*}'
-          merge-multiple: true
+          name: sizes
           path: sizes
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v2
         if: ${{github.event_name == 'pull_request'}}
         continue-on-error: true
         with:
-          pattern: '{cov,cov-*}'
-          merge-multiple: true
+          name: cov
           path: cov
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v2
         if: ${{github.event_name == 'pull_request'}}
         continue-on-error: true
         with:
-          pattern: '{bench,bench-*}'
-          merge-multiple: true
+          name: bench
           path: bench
 
       # try to find results from tests
@@ -866,7 +862,7 @@ jobs:
             body: $comment,
           }' | tee comment/comment.json
       - name: upload-comment
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         with:
           name: comment
           path: comment

lfs.c

@@ -3664,16 +3664,22 @@ static lfs_ssize_t lfs_file_write_(lfs_t *lfs, lfs_file_t *file,
 static lfs_soff_t lfs_file_seek_(lfs_t *lfs, lfs_file_t *file,
         lfs_soff_t off, int whence) {
     // find new pos
-    //
-    // fortunately for us, littlefs is limited to 31-bit file sizes, so we
-    // don't have to worry too much about integer overflow
     lfs_off_t npos = file->pos;
     if (whence == LFS_SEEK_SET) {
         npos = off;
     } else if (whence == LFS_SEEK_CUR) {
-        npos = file->pos + (lfs_off_t)off;
+        if ((lfs_soff_t)file->pos + off < 0) {
+            return LFS_ERR_INVAL;
+        } else {
+            npos = file->pos + off;
+        }
     } else if (whence == LFS_SEEK_END) {
-        npos = (lfs_off_t)lfs_file_size_(lfs, file) + (lfs_off_t)off;
+        lfs_soff_t res = lfs_file_size_(lfs, file) + off;
+        if (res < 0) {
+            return LFS_ERR_INVAL;
+        } else {
+            npos = res;
+        }
     }
 
     if (npos > lfs->file_max) {
@@ -5884,7 +5890,7 @@ int lfs_format(lfs_t *lfs, const struct lfs_config *cfg) {
                 ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
                 ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
                 ".block_size=%"PRIu32", .block_count=%"PRIu32", "
-                ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", "
+                ".block_cycles=%"PRId32", .cache_size=%"PRIu32", "
                 ".lookahead_size=%"PRIu32", .read_buffer=%p, "
                 ".prog_buffer=%p, .lookahead_buffer=%p, "
                 ".name_max=%"PRIu32", .file_max=%"PRIu32", "
@@ -5914,7 +5920,7 @@ int lfs_mount(lfs_t *lfs, const struct lfs_config *cfg) {
                 ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
                 ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
                 ".block_size=%"PRIu32", .block_count=%"PRIu32", "
-                ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", "
+                ".block_cycles=%"PRId32", .cache_size=%"PRIu32", "
                 ".lookahead_size=%"PRIu32", .read_buffer=%p, "
                 ".prog_buffer=%p, .lookahead_buffer=%p, "
                 ".name_max=%"PRIu32", .file_max=%"PRIu32", "
@@ -6051,7 +6057,7 @@ int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) {
         return err;
     }
     LFS_TRACE("lfs_file_open(%p, %p, \"%s\", %x)",
-            (void*)lfs, (void*)file, path, flags);
+            (void*)lfs, (void*)file, path, (unsigned)flags);
     LFS_ASSERT(!lfs_mlist_isopen(lfs->mlist, (struct lfs_mlist*)file));
 
     err = lfs_file_open_(lfs, file, path, flags);
@@ -6071,7 +6077,7 @@ int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file,
     }
     LFS_TRACE("lfs_file_opencfg(%p, %p, \"%s\", %x, %p {"
                  ".buffer=%p, .attrs=%p, .attr_count=%"PRIu32"})",
-            (void*)lfs, (void*)file, path, flags,
+            (void*)lfs, (void*)file, path, (unsigned)flags,
             (void*)cfg, cfg->buffer, (void*)cfg->attrs, cfg->attr_count);
     LFS_ASSERT(!lfs_mlist_isopen(lfs->mlist, (struct lfs_mlist*)file));
 
@@ -6433,7 +6439,7 @@ int lfs_migrate(lfs_t *lfs, const struct lfs_config *cfg) {
                 ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
                 ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
                 ".block_size=%"PRIu32", .block_count=%"PRIu32", "
-                ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", "
+                ".block_cycles=%"PRId32", .cache_size=%"PRIu32", "
                 ".lookahead_size=%"PRIu32", .read_buffer=%p, "
                 ".prog_buffer=%p, .lookahead_buffer=%p, "
                 ".name_max=%"PRIu32", .file_max=%"PRIu32", "

tests/test_seek.toml

@@ -405,111 +405,3 @@ code = '''
     lfs_file_close(&lfs, &file) => 0;
     lfs_unmount(&lfs) => 0;
 '''
-
-
-# test possible overflow/underflow conditions
-#
-# note these need -fsanitize=undefined to consistently detect
-# overflow/underflow conditions
-
-[cases.test_seek_filemax]
-code = '''
-    lfs_t lfs;
-    lfs_format(&lfs, cfg) => 0;
-    lfs_mount(&lfs, cfg) => 0;
-    lfs_file_t file;
-    lfs_file_open(&lfs, &file, "kitty",
-            LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
-    uint8_t buffer[1024];
-    strcpy((char*)buffer, "kittycatcat");
-    size_t size = strlen((char*)buffer);
-    lfs_file_write(&lfs, &file, buffer, size) => size;
-
-    // seek with LFS_SEEK_SET
-    lfs_file_seek(&lfs, &file, LFS_FILE_MAX, LFS_SEEK_SET) => LFS_FILE_MAX;
-
-    // seek with LFS_SEEK_CUR
-    lfs_file_seek(&lfs, &file, 0, LFS_SEEK_CUR) => LFS_FILE_MAX;
-
-    // the file hasn't changed size, so seek end takes us back to the offset=0
-    lfs_file_seek(&lfs, &file, +10, LFS_SEEK_END) => size+10;
-
-    lfs_file_close(&lfs, &file) => 0;
-    lfs_unmount(&lfs) => 0;
-'''
-
-[cases.test_seek_underflow]
-code = '''
-    lfs_t lfs;
-    lfs_format(&lfs, cfg) => 0;
-    lfs_mount(&lfs, cfg) => 0;
-    lfs_file_t file;
-    lfs_file_open(&lfs, &file, "kitty",
-            LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
-    uint8_t buffer[1024];
-    strcpy((char*)buffer, "kittycatcat");
-    size_t size = strlen((char*)buffer);
-    lfs_file_write(&lfs, &file, buffer, size) => size;
-
-    // underflow with LFS_SEEK_CUR, should error
-    lfs_file_seek(&lfs, &file, -(size+10), LFS_SEEK_CUR) => LFS_ERR_INVAL;
-    lfs_file_seek(&lfs, &file, -LFS_FILE_MAX, LFS_SEEK_CUR) => LFS_ERR_INVAL;
-    lfs_file_seek(&lfs, &file, -(size+LFS_FILE_MAX), LFS_SEEK_CUR)
-            => LFS_ERR_INVAL;
-
-    // underflow with LFS_SEEK_END, should error
-    lfs_file_seek(&lfs, &file, -(size+10), LFS_SEEK_END) => LFS_ERR_INVAL;
-    lfs_file_seek(&lfs, &file, -LFS_FILE_MAX, LFS_SEEK_END) => LFS_ERR_INVAL;
-    lfs_file_seek(&lfs, &file, -(size+LFS_FILE_MAX), LFS_SEEK_END)
-            => LFS_ERR_INVAL;
-
-    // file pointer should not have changed
-    lfs_file_tell(&lfs, &file) => size;
-
-    lfs_file_close(&lfs, &file) => 0;
-    lfs_unmount(&lfs) => 0;
-'''
-
-[cases.test_seek_overflow]
-code = '''
-    lfs_t lfs;
-    lfs_format(&lfs, cfg) => 0;
-    lfs_mount(&lfs, cfg) => 0;
-    lfs_file_t file;
-    lfs_file_open(&lfs, &file, "kitty",
-            LFS_O_WRONLY | LFS_O_CREAT | LFS_O_APPEND) => 0;
-    uint8_t buffer[1024];
-    strcpy((char*)buffer, "kittycatcat");
-    size_t size = strlen((char*)buffer);
-    lfs_file_write(&lfs, &file, buffer, size) => size;
-
-    // seek to LFS_FILE_MAX
-    lfs_file_seek(&lfs, &file, LFS_FILE_MAX, LFS_SEEK_SET) => LFS_FILE_MAX;
-
-    // overflow with LFS_SEEK_CUR, should error
-    lfs_file_seek(&lfs, &file, +10, LFS_SEEK_CUR) => LFS_ERR_INVAL;
-    lfs_file_seek(&lfs, &file, +LFS_FILE_MAX, LFS_SEEK_CUR) => LFS_ERR_INVAL;
-
-    // LFS_SEEK_SET/END don't care about the current file position, but we can
-    // still overflow with a large offset
-
-    // overflow with LFS_SEEK_SET, should error
-    lfs_file_seek(&lfs, &file,
-            +((uint32_t)LFS_FILE_MAX+10),
-            LFS_SEEK_SET) => LFS_ERR_INVAL;
-    lfs_file_seek(&lfs, &file,
-            +((uint32_t)LFS_FILE_MAX+(uint32_t)LFS_FILE_MAX),
-            LFS_SEEK_SET) => LFS_ERR_INVAL;
-
-    // overflow with LFS_SEEK_END, should error
-    lfs_file_seek(&lfs, &file, +(LFS_FILE_MAX-size+10), LFS_SEEK_END)
-            => LFS_ERR_INVAL;
-    lfs_file_seek(&lfs, &file, +(LFS_FILE_MAX-size+LFS_FILE_MAX), LFS_SEEK_END)
-            => LFS_ERR_INVAL;
-
-    // file pointer should not have changed
-    lfs_file_tell(&lfs, &file) => LFS_FILE_MAX;
-
-    lfs_file_close(&lfs, &file) => 0;
-    lfs_unmount(&lfs) => 0;
-'''