Skip to contentSkip to conversation

e2image: correct group descriptors size in ext2fs_image_super_read()

PATCH Applied Li Dongyang 3 participants 3 messages Jul 14, 2023 – Feb 8, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 e2image: correct group descriptors size in ext2fs_image_super_read()

From: Emoly Liu <[email protected]>

In function ext2fs_image_super_read(), the size of block group descriptors should be (fs->blocksize * fs->desc_blocks), but not (fs->blocksize * fs->group_desc_count).

---
 lib/ext2fs/imager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/ext2fs/imager.c +2 -2
index 23290a6a..16b09770 100644
@@ -299,7 +299,7 @@ errcode_t ext2fs_image_super_read(ext2_filsys fs, int fd,
        ssize_t         actual, size;
        errcode_t       retval;
 
-       size = (ssize_t)fs->blocksize * (fs->group_desc_count + 1);
+       size = (ssize_t)fs->blocksize * (fs->desc_blocks + 1);
        buf = malloc(size);
        if (!buf)
                return ENOMEM;
@@ -323,7 +323,7 @@ errcode_t ext2fs_image_super_read(ext2_filsys fs, int fd,
        memcpy(fs->super, buf, SUPERBLOCK_SIZE);
 
        memcpy(fs->group_desc, buf + fs->blocksize,
-              (ssize_t)fs->blocksize * fs->group_desc_count);
+              (ssize_t)fs->blocksize * fs->desc_blocks);
 
        retval = 0;
 
Signature · 1 line
2.41.0
#2 lore raw
In reply to Li Dongyang
Quoted 5 lines · Li Dongyang

In function ext2fs_image_super_read(), the size of block group descriptors should be (fs->blocksize * fs->desc_blocks), but not (fs->blocksize * fs->group_desc_count).

Applied, thanks!

[1/1] e2image: correct group descriptors size in ext2fs_image_super_read()

      commit: 633ab26eefe1b037eaba82d9a3555eb712c82345

(Note: this patch was white-space damaged so I had to apply it by hand.)

Best regards,

Signature · 1 line
Theodore Ts'o <[email protected]>