From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5430AC433F5 for ; Tue, 28 Sep 2021 06:03:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D2916113E for ; Tue, 28 Sep 2021 06:03:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239096AbhI1GEe (ORCPT ); Tue, 28 Sep 2021 02:04:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:48780 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239869AbhI1GCs (ORCPT ); Tue, 28 Sep 2021 02:02:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 12A59613AC; Tue, 28 Sep 2021 05:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632808658; bh=27whueOksSIGYwWBQXzhOYss4ziLaN09BDh/OORgVbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OFr88ypFHpL1XibGPINm878L5F3mVRI0GkviwT47PWcHX666OIW2Ts1TXvJia4R2V En69wxmay/2fjPW1B6wbU0LApAciW/icUmKzqrGYBRlOLx3ldVszhJ1iq+E119v/Dw agMgVPhcmJGCT6fcMfP5c7tvqRmptHIp4Ll+zazttm/Y8P7Ky5UBNR5uB/0+IPx1oA 7CWXEYFTf7CfdOM9/ZR1TCe01a2heWM0Iu599O0tmFcszlbhd/MTaZMhGhDSu8QRjL 1M6AcroNVOqukMvtcI7ODBvJynm5oZQIcSeR66ePYiDehBoPrU0MCdh7u3gMhxsmNe 8pL0GCljhSgRg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Jan Kara , Sasha Levin , jack@suse.com, linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 4/6] ext2: fix sleeping in atomic bugs on error Date: Tue, 28 Sep 2021 01:57:32 -0400 Message-Id: <20210928055734.173182-4-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210928055734.173182-1-sashal@kernel.org> References: <20210928055734.173182-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dan Carpenter [ 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: Dan Carpenter Signed-off-by: Jan Kara Signed-off-by: Sasha Levin --- fs/ext2/balloc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index 4c40c0786e16..bd32140bdfee 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c @@ -46,10 +46,9 @@ 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 - " - "block_group = %d, groups_count = %lu", - block_group, sbi->s_groups_count); + WARN(1, "block_group >= groups_count - " + "block_group = %d, groups_count = %lu", + block_group, sbi->s_groups_count); return NULL; } @@ -57,10 +56,9 @@ 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 - " - "block_group = %d, group_desc = %lu, desc = %lu", - block_group, group_desc, offset); + WARN(1, "Group descriptor not loaded - " + "block_group = %d, group_desc = %lu, desc = %lu", + block_group, group_desc, offset); return NULL; } -- 2.33.0