Skip to content

Commit ee85e09

Browse files
OjaswinMtytso
authored andcommitted
ext4: check stripe size compatibility on remount as well
We disable stripe size in __ext4_fill_super if it is not a multiple of the cluster ratio however this check is missed when trying to remount. This can leave us with cases where stripe < cluster_ratio after remount:set making EXT4_B2C(sbi->s_stripe) become 0 that can cause some unforeseen bugs like divide by 0. Fix that by adding the check in remount path as well. Reported-by: syzbot+1ad8bac5af24d01e2cbd@syzkaller.appspotmail.com Tested-by: syzbot+1ad8bac5af24d01e2cbd@syzkaller.appspotmail.com Reviewed-by: Kemeng Shi <shikemeng@huaweicloud.com> Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> Fixes: c3defd9 ("ext4: treat stripe in block unit") Signed-off-by: Ojaswin Mujoo <ojaswin@linux.ibm.com> Link: https://patch.msgid.link/3a493bb503c3598e25dcfbed2936bb2dff3fece7.1725002410.git.ojaswin@linux.ibm.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent cc749e6 commit ee85e09

File tree

1 file changed

+22
-7
lines changed

1 file changed

+22
-7
lines changed

fs/ext4/super.c

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5178,6 +5178,18 @@ static int ext4_block_group_meta_init(struct super_block *sb, int silent)
51785178
return 0;
51795179
}
51805180

5181+
/*
5182+
* It's hard to get stripe aligned blocks if stripe is not aligned with
5183+
* cluster, just disable stripe and alert user to simplify code and avoid
5184+
* stripe aligned allocation which will rarely succeed.
5185+
*/
5186+
static bool ext4_is_stripe_incompatible(struct super_block *sb, unsigned long stripe)
5187+
{
5188+
struct ext4_sb_info *sbi = EXT4_SB(sb);
5189+
return (stripe > 0 && sbi->s_cluster_ratio > 1 &&
5190+
stripe % sbi->s_cluster_ratio != 0);
5191+
}
5192+
51815193
static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
51825194
{
51835195
struct ext4_super_block *es = NULL;
@@ -5287,13 +5299,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)
52875299
goto failed_mount3;
52885300

52895301
sbi->s_stripe = ext4_get_stripe_size(sbi);
5290-
/*
5291-
* It's hard to get stripe aligned blocks if stripe is not aligned with
5292-
* cluster, just disable stripe and alert user to simpfy code and avoid
5293-
* stripe aligned allocation which will rarely successes.
5294-
*/
5295-
if (sbi->s_stripe > 0 && sbi->s_cluster_ratio > 1 &&
5296-
sbi->s_stripe % sbi->s_cluster_ratio != 0) {
5302+
if (ext4_is_stripe_incompatible(sb, sbi->s_stripe)) {
52975303
ext4_msg(sb, KERN_WARNING,
52985304
"stripe (%lu) is not aligned with cluster size (%u), "
52995305
"stripe is disabled",
@@ -6457,6 +6463,15 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
64576463

64586464
}
64596465

6466+
if ((ctx->spec & EXT4_SPEC_s_stripe) &&
6467+
ext4_is_stripe_incompatible(sb, ctx->s_stripe)) {
6468+
ext4_msg(sb, KERN_WARNING,
6469+
"stripe (%lu) is not aligned with cluster size (%u), "
6470+
"stripe is disabled",
6471+
ctx->s_stripe, sbi->s_cluster_ratio);
6472+
ctx->s_stripe = 0;
6473+
}
6474+
64606475
/*
64616476
* Changing the DIOREAD_NOLOCK or DELALLOC mount options may cause
64626477
* two calls to ext4_should_dioread_nolock() to return inconsistent

0 commit comments

Comments
 (0)