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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92FB6C2BA19 for ; Wed, 15 Apr 2020 12:27:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63EA1208FE for ; Wed, 15 Apr 2020 12:27:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586953665; bh=9k+lY/X2o3OmoK9PfH0p755wlKlqh+FXHcCPhQShekw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dO/iWO/UGvni+JresuY5AwkiRwL0RyXtUKIPc60aM0j4jXczDxsjzpY4nsH5mU2zu jrNk34T80l5t0QX8Yh4HSoBKj5U7zA+FsI873VystBh0CYqoQstVyTGa4vI5HAfDVn ruTrERn0R+awFBNVZ+b1+LqTtwx0vCNEzCZqI+/k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2409881AbgDOM1T (ORCPT ); Wed, 15 Apr 2020 08:27:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:38902 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409164AbgDOLpX (ORCPT ); Wed, 15 Apr 2020 07:45:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 567D620775; Wed, 15 Apr 2020 11:45:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586951122; bh=9k+lY/X2o3OmoK9PfH0p755wlKlqh+FXHcCPhQShekw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tUV07UZv0Hp3C/XRYcjFAWzjsx7x4AODZgufyTuIJQ2nMvKYtfJZpZlOb1PhvIS8N 1msNbb5Y6ogJ4sNSvjceXetwRmmDWagN9Zapd/g8dvNuvVuxEhEzT9NAKPJ+hdxZO1 jLlyYr+t6emfrLItRHr2Zj2SIy2Nj6It6YkrAP2s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Josh Triplett , Theodore Ts'o , Sasha Levin , linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 35/84] ext4: fix incorrect group count in ext4_fill_super error message Date: Wed, 15 Apr 2020 07:43:52 -0400 Message-Id: <20200415114442.14166-35-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415114442.14166-1-sashal@kernel.org> References: <20200415114442.14166-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Josh Triplett [ Upstream commit df41460a21b06a76437af040d90ccee03888e8e5 ] ext4_fill_super doublechecks the number of groups before mounting; if that check fails, the resulting error message prints the group count from the ext4_sb_info sbi, which hasn't been set yet. Print the freshly computed group count instead (which at that point has just been computed in "blocks_count"). Signed-off-by: Josh Triplett Fixes: 4ec1102813798 ("ext4: Add sanity checks for the superblock before mounting the filesystem") Link: https://lore.kernel.org/r/8b957cd1513fcc4550fe675c10bcce2175c33a49.1585431964.git.josh@joshtriplett.org Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index ff3f300dbd642..855b36d77f4fd 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4239,9 +4239,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) EXT4_BLOCKS_PER_GROUP(sb) - 1); do_div(blocks_count, EXT4_BLOCKS_PER_GROUP(sb)); if (blocks_count > ((uint64_t)1<<32) - EXT4_DESC_PER_BLOCK(sb)) { - ext4_msg(sb, KERN_WARNING, "groups count too large: %u " + ext4_msg(sb, KERN_WARNING, "groups count too large: %llu " "(block count %llu, first data block %u, " - "blocks per group %lu)", sbi->s_groups_count, + "blocks per group %lu)", blocks_count, ext4_blocks_count(es), le32_to_cpu(es->s_first_data_block), EXT4_BLOCKS_PER_GROUP(sb)); -- 2.20.1