Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f194b57 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

ext2: fix sleeping in atomic bugs on error 

[ Upstream commit 372d1f3e1bfede719864d0d1fbf3146b1e638c88 ]

The ext2_error() function syncs the filesystem so it sleeps.  The caller
is holding a spinlock so it's not allowed to sleep.

   ext2_statfs() <- disables preempt
   -> ext2_count_free_blocks()
      -> ext2_get_group_desc()

Fix this by using WARN() to print an error message and a stack trace
instead of using ext2_error().

Link: https://lore.kernel.org/r/20210921203233.GA16529@kili


Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2d8eb456

fs/ext2/balloc.c

+6 −8
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb, 
	struct ext2_sb_info *sbi = EXT2_SB(sb);



	if (block_group >= sbi->s_groups_count) {

		ext2_error (sb, "ext2_get_group_desc",

			    "block_group >= groups_count - "

		WARN(1, "block_group >= groups_count - "

		     "block_group = %d, groups_count = %lu",

		     block_group, sbi->s_groups_count);
@@ -59,8 +58,7 @@ struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb, 
	group_desc = block_group >> EXT2_DESC_PER_BLOCK_BITS(sb);

	offset = block_group & (EXT2_DESC_PER_BLOCK(sb) - 1);

	if (!sbi->s_group_desc[group_desc]) {

		ext2_error (sb, "ext2_get_group_desc",

			    "Group descriptor not loaded - "

		WARN(1, "Group descriptor not loaded - "

		     "block_group = %d, group_desc = %lu, desc = %lu",

		      block_group, group_desc, offset);

		return NULL;