| Message ID | 20180530125118.25274-10-jack@suse.cz |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | e2fsprogs: Handle s_inodes_count overflow better | expand |
On May 30, 2018, at 6:51 AM, Jan Kara <jack@suse.cz> wrote: > > Don't verify s_inodes_count is correct with EXT2_FLAG_IGNORE_SB_ERRORS > flag set. This allows e2fsck and debugfs to fix this value. > > Signed-off-by: Jan Kara <jack@suse.cz> Reviewed-by: Andreas Dilger <adilger@dilger.ca> > --- > lib/ext2fs/openfs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c > index e9ad0cd1a2c6..d046b2517505 100644 > --- a/lib/ext2fs/openfs.c > +++ b/lib/ext2fs/openfs.c > @@ -386,7 +386,8 @@ errcode_t ext2fs_open2(const char *name, const char *io_options, > goto cleanup; > } > fs->group_desc_count = groups_cnt; > - if ((__u64)fs->group_desc_count * EXT2_INODES_PER_GROUP(fs->super) != > + if (!(flags & EXT2_FLAG_IGNORE_SB_ERRORS) && > + (__u64)fs->group_desc_count * EXT2_INODES_PER_GROUP(fs->super) != > fs->super->s_inodes_count) { > retval = EXT2_ET_CORRUPT_SUPERBLOCK; > goto cleanup; > -- > 2.13.6 > Cheers, Andreas
diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c index e9ad0cd1a2c6..d046b2517505 100644 --- a/lib/ext2fs/openfs.c +++ b/lib/ext2fs/openfs.c @@ -386,7 +386,8 @@ errcode_t ext2fs_open2(const char *name, const char *io_options, goto cleanup; } fs->group_desc_count = groups_cnt; - if ((__u64)fs->group_desc_count * EXT2_INODES_PER_GROUP(fs->super) != + if (!(flags & EXT2_FLAG_IGNORE_SB_ERRORS) && + (__u64)fs->group_desc_count * EXT2_INODES_PER_GROUP(fs->super) != fs->super->s_inodes_count) { retval = EXT2_ET_CORRUPT_SUPERBLOCK; goto cleanup;
Don't verify s_inodes_count is correct with EXT2_FLAG_IGNORE_SB_ERRORS flag set. This allows e2fsck and debugfs to fix this value. Signed-off-by: Jan Kara <jack@suse.cz> --- lib/ext2fs/openfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)