* [PATCH] ext4: Drop the call to ext4_error() from ext4_get_group_info()
@ 2023-06-14 10:02 Fabio M. De Francesco
2023-06-15 14:59 ` Theodore Ts'o
0 siblings, 1 reply; 2+ messages in thread
From: Fabio M. De Francesco @ 2023-06-14 10:02 UTC (permalink / raw)
To: Theodore Ts'o, Andreas Dilger, linux-ext4, linux-kernel
Cc: Fabio M. De Francesco, syzbot+4acc7d910e617b360859
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: 5354b2af3406 ("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>
---
fs/ext4/balloc.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index c1edde817be8..e8da678a0103 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -324,17 +324,15 @@ static ext4_fsblk_t ext4_valid_block_bitmap_padding(struct super_block *sb,
struct ext4_group_info *ext4_get_group_info(struct super_block *sb,
ext4_group_t group)
{
- struct ext4_group_info **grp_info;
- long indexv, indexh;
-
- if (unlikely(group >= EXT4_SB(sb)->s_groups_count)) {
- ext4_error(sb, "invalid group %u", group);
- return NULL;
- }
- indexv = group >> (EXT4_DESC_PER_BLOCK_BITS(sb));
- indexh = group & ((EXT4_DESC_PER_BLOCK(sb)) - 1);
- grp_info = sbi_array_rcu_deref(EXT4_SB(sb), s_group_info, indexv);
- return grp_info[indexh];
+ struct ext4_group_info **grp_info;
+ long indexv, indexh;
+
+ if (unlikely(group >= EXT4_SB(sb)->s_groups_count))
+ return NULL;
+ indexv = group >> (EXT4_DESC_PER_BLOCK_BITS(sb));
+ indexh = group & ((EXT4_DESC_PER_BLOCK(sb)) - 1);
+ grp_info = sbi_array_rcu_deref(EXT4_SB(sb), s_group_info, indexv);
+ return grp_info[indexh];
}
/*
--
2.41.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ext4: Drop the call to ext4_error() from ext4_get_group_info()
2023-06-14 10:02 [PATCH] ext4: Drop the call to ext4_error() from ext4_get_group_info() Fabio M. De Francesco
@ 2023-06-15 14:59 ` Theodore Ts'o
0 siblings, 0 replies; 2+ messages in thread
From: Theodore Ts'o @ 2023-06-15 14:59 UTC (permalink / raw)
To: Andreas Dilger, linux-ext4, linux-kernel, Fabio M. De Francesco
Cc: Theodore Ts'o, syzbot+4acc7d910e617b360859
On Wed, 14 Jun 2023 12:02:55 +0200, Fabio M. De Francesco wrote:
> 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).
>
> [...]
Applied, thanks!
[1/1] ext4: Drop the call to ext4_error() from ext4_get_group_info()
commit: f451fd97dd2b78f286379203a47d9d295c467255
Best regards,
--
Theodore Ts'o <tytso@mit.edu>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-15 15:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-14 10:02 [PATCH] ext4: Drop the call to ext4_error() from ext4_get_group_info() Fabio M. De Francesco
2023-06-15 14:59 ` Theodore Ts'o
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.