Fixed buffer overflow due to mistaking prog_size for cache_size

found by ajaybhargav
Merge pull request #151 from Krakonos/master
2025-11-01 16:14:13 +01:00 · 2019-04-12 08:44:00 -05:00 · 2019-04-12 17:07:25 -05:00 · 2019-04-12 17:06:58 -05:00 · 2019-04-12 15:13:00 -05:00 · 2019-04-12 15:09:44 -05:00
3 changed files with 8 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -139,7 +139,7 @@ jobs:
      install:
        - sudo apt-get install libfuse-dev
        - git clone --depth 1 https://github.com/geky/littlefs-fuse -b v2-alpha v2
-        - git clone --depth 1 https://github.com/geky/littlefs-fuse v1
+        - git clone --depth 1 https://github.com/geky/littlefs-fuse -b v1 v1
        - fusermount -V
        - gcc --version
      before_script:
--- a/lfs.c
+++ b/lfs.c
@@ -29,7 +29,7 @@ static inline void lfs_cache_drop(lfs_t *lfs, lfs_cache_t *rcache) {

 static inline void lfs_cache_zero(lfs_t *lfs, lfs_cache_t *pcache) {
    // zero to avoid information leak
-    memset(pcache->buffer, 0xff, lfs->cfg->prog_size);
+    memset(pcache->buffer, 0xff, lfs->cfg->cache_size);
    pcache->block = 0xffffffff;
 }

@@ -2864,6 +2864,10 @@ int lfs_file_truncate(lfs_t *lfs, lfs_file_t *file, lfs_off_t size) {
        return LFS_ERR_BADF;
    }

+    if (size > LFS_FILE_MAX) {
+        return LFS_ERR_INVAL;
+    }
+
    lfs_off_t oldsize = lfs_file_size(lfs, file);
    if (size < oldsize) {
        // need to flush since directly changing metadata
--- a/lfs.h
+++ b/lfs.h
@@ -578,7 +578,8 @@ int lfs_dir_close(lfs_t *lfs, lfs_dir_t *dir);
 // Read an entry in the directory
 //
 // Fills out the info structure, based on the specified file or directory.
-// Returns a negative error code on failure.
+// Returns a positive value on success, 0 at the end of directory,
+// or a negative error code on failure.
 int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info);

 // Change the position of the directory
Author	SHA1	Message	Date
Christopher Haster	780ef2fce4	Fixed buffer overflow due to mistaking prog_size for cache_size found by ajaybhargav	2019-04-12 08:44:00 -05:00
Christopher Haster	73ea008b74	Merge pull request #151 from Krakonos/master Fixed documentation for return lfs_dir_read return value.	2019-04-12 17:07:25 -05:00
Christopher Haster	c849748453	Merge pull request #150 from ajaybhargav/truncate-fix Fix: length more than LFS_FILE_MAX should return error	2019-04-12 17:06:58 -05:00
Christopher Haster	25a843aab7	Fixed .travis.yml to use explicit branch names for migration testing This lets us actually update the littlefs-fuse repo instead of being bound to master for v1.	2019-04-12 15:13:00 -05:00
Ajay Bhargav	905727b684	Fix: length more than LFS_FILE_MAX should return error To make lfs_file_truncate inline with ftruncate function, when -ve or size more than maximum file size is passed to function it should return invalid parameter error. In LFS case LFS_ERR_INVAL. Signed-off-by: Ajay Bhargav <contact@rickeyworld.info>	2019-04-12 15:09:44 -05:00
Christopher Haster	0907ba7813	Merge pull request #85 from ARMmbed/v2-alpha v2: Metadata logging, custom attributes, inline files, and a major version bump	2019-04-10 20:49:34 -05:00
Ladislav Láska	26d25608b6	Fixed documentation for return lfs_dir_read return value. lfs_dir_read breaks the convention of returning non-zero on success, this feature should be at least documented.	2019-03-01 10:01:02 +01:00