ext4: Verify s_clusters_per_group even without bigalloc
Jan Kara
reviewerPATCH v2 1/1 ext4: Verify s_clusters_per_group even without bigalloc
Currently we ignore s_clusters_per_group field in the on-disk superblock if bigalloc feature is not enabled. However e2fsprogs don't even open the filesystem if s_clusters_per_group is invalid. This results in an odd state where kernel happily works with the filesystem while even e2fsck refuses to touch it. Verify that s_clusters_per_group is valid even if bigalloc feature is not enabled to make things consistent. Due to current e2fsprogs behavior it is unlikely there are filesystems out in the wild (except for intentionally fuzzed ones) with invalid s_clusters_per_group counts.
--- fs/ext4/super.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
Changes since v1:
* share code checking s_clusters_per_group for !bigalloc & bigalloc configs
fs/ext4/super.c +13 -17
@@ -4422,22 +4422,6 @@ static int ext4_handle_clustersize(struct super_block *sb) } sbi->s_cluster_bits =le32_to_cpu (es->s_log_cluster_size) -le32_to_cpu (es->s_log_block_size); - sbi->s_clusters_per_group = -le32_to_cpu (es->s_clusters_per_group); -if (sbi->s_clusters_per_group > sb->s_blocksize *8 ) { -ext4_msg (sb,KERN_ERR , -"#clusters per group too big: %lu" , - sbi->s_clusters_per_group); -return -EINVAL ; - } -if (sbi->s_blocks_per_group != - (sbi->s_clusters_per_group * (clustersize / sb->s_blocksize))) { -ext4_msg (sb,KERN_ERR ,"blocks per group (%lu) and " -"clusters per group (%lu) inconsistent" , - sbi->s_blocks_per_group, - sbi->s_clusters_per_group); -return -EINVAL ; - } }else {if (clustersize != sb->s_blocksize) { ext4_msg(sb, KERN_ERR,
@@ -4451,9 +4435,21 @@ static int ext4_handle_clustersize(struct super_block *sb) sbi->s_blocks_per_group);return -EINVAL ; } - sbi->s_clusters_per_group = sbi->s_blocks_per_group; sbi->s_cluster_bits =0 ; } + sbi->s_clusters_per_group =le32_to_cpu (es->s_clusters_per_group); +if (sbi->s_clusters_per_group > sb->s_blocksize *8 ) { +ext4_msg (sb,KERN_ERR ,"#clusters per group too big: %lu" , + sbi->s_clusters_per_group); +return -EINVAL ; + } +if (sbi->s_blocks_per_group != + (sbi->s_clusters_per_group * (clustersize / sb->s_blocksize))) { +ext4_msg (sb,KERN_ERR , +"blocks per group (%lu) and clusters per group (%lu) inconsistent" , + sbi->s_blocks_per_group, sbi->s_clusters_per_group); +return -EINVAL ; + } sbi->s_cluster_ratio = clustersize / sb->s_blocksize;/* Do we have standard group size of clustersize * 8 blocks ? */
Signature · 1 line
2.35.3
Quoted 11 lines · Jan Kara
Currently we ignore
s_clusters_per_groupfield in the on-disk superblock if bigalloc feature is not enabled. However e2fsprogs don't even open the filesystem ifs_clusters_per_groupis invalid. This results in an odd state where kernel happily works with the filesystem while even e2fsck refuses to touch it. Verify thats_clusters_per_groupis valid even if bigalloc feature is not enabled to make things consistent. Due to current e2fsprogs behavior it is unlikely there are filesystems out in the wild (except for intentionally fuzzed ones) with invalids_clusters_per_groupcounts.Signed-off-by Jan Kara <[email protected]>
Thanks, looks good to me.
Quoted 58 lines
--- fs/ext4/super.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)Changes since v1:
* share code checkings_clusters_per_groupfor !bigalloc & bigalloc configsfs/ext4/super.c +13
-17@@ -4422,22 +4422,6 @@ static int ext4_handle_clustersize(struct super_block *sb) } sbi->s_cluster_bits =le32_to_cpu (es->s_log_cluster_size) -le32_to_cpu (es->s_log_block_size); - sbi->s_clusters_per_group = -le32_to_cpu (es->s_clusters_per_group); -if (sbi->s_clusters_per_group > sb->s_blocksize *8 ) { -ext4_msg (sb,KERN_ERR , -"#clusters per group too big: %lu" , - sbi->s_clusters_per_group); -return -EINVAL ; - } -if (sbi->s_blocks_per_group != - (sbi->s_clusters_per_group * (clustersize / sb->s_blocksize))) { -ext4_msg (sb,KERN_ERR ,"blocks per group (%lu) and " -"clusters per group (%lu) inconsistent" , - sbi->s_blocks_per_group, - sbi->s_clusters_per_group); -return -EINVAL ; - } }else {if (clustersize != sb->s_blocksize) { ext4_msg(sb, KERN_ERR,@@ -4451,9 +4435,21 @@ static int ext4_handle_clustersize(struct super_block *sb) sbi->s_blocks_per_group);return -EINVAL ; } - sbi->s_clusters_per_group = sbi->s_blocks_per_group; sbi->s_cluster_bits =0 ; } + sbi->s_clusters_per_group =le32_to_cpu (es->s_clusters_per_group); +if (sbi->s_clusters_per_group > sb->s_blocksize *8 ) { +ext4_msg (sb,KERN_ERR ,"#clusters per group too big: %lu" , + sbi->s_clusters_per_group); +return -EINVAL ; + } +if (sbi->s_blocks_per_group != + (sbi->s_clusters_per_group * (clustersize / sb->s_blocksize))) { +ext4_msg (sb,KERN_ERR , +"blocks per group (%lu) and clusters per group (%lu) inconsistent" , + sbi->s_blocks_per_group, sbi->s_clusters_per_group); +return -EINVAL ; + } sbi->s_cluster_ratio = clustersize / sb->s_blocksize;/* Do we have standard group size of clustersize * 8 blocks ? */
Quoted 11 lines · Jan Kara
Currently we ignore
s_clusters_per_groupfield in the on-disk superblock if bigalloc feature is not enabled. However e2fsprogs don't even open the filesystem ifs_clusters_per_groupis invalid. This results in an odd state where kernel happily works with the filesystem while even e2fsck refuses to touch it. Verify thats_clusters_per_groupis valid even if bigalloc feature is not enabled to make things consistent. Due to current e2fsprogs behavior it is unlikely there are filesystems out in the wild (except for intentionally fuzzed ones) with invalids_clusters_per_groupcounts.[...]
Applied, thanks!
[1/1] ext4: Verify s_clusters_per_group even without bigalloc
commit: 1f85b452e07c370448fb4eb4472cd55fc6bf115c
Best regards,
Signature · 1 line
Theodore Ts'o <[email protected]>