Skip to content

Commit f451fd9

Browse files
xp4ns3tytso
authored andcommitted
ext4: drop the call to ext4_error() from ext4_get_group_info()
A recent patch added a call to ext4_error() which is problematic since some callers of the ext4_get_group_info() function may be holding a spinlock, whereas ext4_error() must never be called in atomic context. This triggered a report from Syzbot: "BUG: sleeping function called from invalid context in ext4_update_super" (see the link below). Therefore, drop the call to ext4_error() from ext4_get_group_info(). In the meantime use eight characters tabs instead of nine characters ones. Reported-by: syzbot+4acc7d910e617b360859@syzkaller.appspotmail.com Closes: https://lore.kernel.org/all/00000000000070575805fdc6cdb2@google.com/ Fixes: 5354b2a ("ext4: allow ext4_get_group_info() to fail") Suggested-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com> Link: https://lore.kernel.org/r/20230614100446.14337-1-fmdefrancesco@gmail.com
1 parent 1948279 commit f451fd9

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

fs/ext4/balloc.c

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -324,17 +324,15 @@ static ext4_fsblk_t ext4_valid_block_bitmap_padding(struct super_block *sb,
324324
struct ext4_group_info *ext4_get_group_info(struct super_block *sb,
325325
ext4_group_t group)
326326
{
327-
struct ext4_group_info **grp_info;
328-
long indexv, indexh;
329-
330-
if (unlikely(group >= EXT4_SB(sb)->s_groups_count)) {
331-
ext4_error(sb, "invalid group %u", group);
332-
return NULL;
333-
}
334-
indexv = group >> (EXT4_DESC_PER_BLOCK_BITS(sb));
335-
indexh = group & ((EXT4_DESC_PER_BLOCK(sb)) - 1);
336-
grp_info = sbi_array_rcu_deref(EXT4_SB(sb), s_group_info, indexv);
337-
return grp_info[indexh];
327+
struct ext4_group_info **grp_info;
328+
long indexv, indexh;
329+
330+
if (unlikely(group >= EXT4_SB(sb)->s_groups_count))
331+
return NULL;
332+
indexv = group >> (EXT4_DESC_PER_BLOCK_BITS(sb));
333+
indexh = group & ((EXT4_DESC_PER_BLOCK(sb)) - 1);
334+
grp_info = sbi_array_rcu_deref(EXT4_SB(sb), s_group_info, indexv);
335+
return grp_info[indexh];
338336
}
339337

340338
/*

0 commit comments

Comments
 (0)