Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Andreas Dilger <adilger@dilger.ca>
Message-Id: <04E7F659-18B0-4CD2-8DE9-F69310BC3B06@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_2B7A53DC-1CFC-440F-9207-9F623ED30540";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH] ext4: Fix incorrect group count in ext4_fill_super error
 message
Date:   Sat, 28 Mar 2020 17:07:55 -0600
In-Reply-To: <8b957cd1513fcc4550fe675c10bcce2175c33a49.1585431964.git.josh@joshtriplett.org>
Cc:     linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
        Theodore Ts'o <tytso@mit.edu>,
        Andreas Dilger <adilger.kernel@dilger.ca>
To:     Josh Triplett <josh@joshtriplett.org>
References: <8b957cd1513fcc4550fe675c10bcce2175c33a49.1585431964.git.josh@joshtriplett.org>
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk


--Apple-Mail=_2B7A53DC-1CFC-440F-9207-9F623ED30540
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

On Mar 28, 2020, at 3:54 PM, Josh Triplett <josh@joshtriplett.org> =
wrote:
>=20
> 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").
>=20
> Signed-off-by: Josh Triplett <josh@joshtriplett.org>
> Fixes: 4ec1102813798 ("ext4: Add sanity checks for the superblock =
before mounting the filesystem")

Modulo the compiler warning pointed out by kbuild test robot, I think =
the
patch is correct, but was definitely confusing to read within the shown
context, since "blocks_count" definitely doesn't seem to be "groups =
count"
(it *is* the "groups count", but is just used as a temporary variable).

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> ---
> fs/ext4/super.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 0c7c4adb664e..7f5f37653a03 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -4288,7 +4288,7 @@ static int ext4_fill_super(struct super_block =
*sb, void *data, int silent)
> 	if (blocks_count > ((uint64_t)1<<32) - EXT4_DESC_PER_BLOCK(sb)) =
{
> 		ext4_msg(sb, KERN_WARNING, "groups count too large: %u "
> 		       "(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.26.0


Cheers, Andreas


--Apple-Mail=_2B7A53DC-1CFC-440F-9207-9F623ED30540
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQIzBAEBCAAdFiEEDb73u6ZejP5ZMprvcqXauRfMH+AFAl5/2MsACgkQcqXauRfM
H+AnOA//V5uFfStVfTWVl2zs4J2jWpYVCG9kzT4xGrYRLk2srDgIklQessjbYYfb
kXvYFep6nBH0IOc3Ry1goyuuU2HiuYNoQe/VC+Wk2azc1RrZ+1IeuZulWJxKgi5b
DAAt0OvlnBRm6DnWB8183pjfrJVoVk+hdH4E0woSVsWb7L0THgp4b20btwd5jDD5
o6a8pecxjuTzpyB3/eVB8LNu5Ja3TCXcaUpQrIFFnGWTRllj74AuglK9nASN62F/
3ZRPHIVG/QOp/uc5Gpr1IB8lSkzG8ehKMgvS7HUB+6zymhmfx2+I+yB1SeAHYVQu
sz4+9vZdpliyInpJDaZPPvOilY2c9zH5hK+LhXnENwbWQxRdxOPU3CjSumYO6spk
/hj/UMcMx1JSDeEKq5CYokPfnZh0B6Qn/WjOsJobID0kM3d2c/5UbiITe3rZ/DkR
bjSaVVlVQ5eZdT8NbOVJ/nmxlxhhHbOm3nA3sKIS47SBbKURseSKJI7LACYdJEN0
/7xVU31zAw857nxMqInE53ghCVFLs8eXL6hsMSc1i7XWN/3hIUcGiGUNffESs7Rm
OuzKT1n8tizaiUQxQNXeNU0bNyaF/TWdQSf9rnNJRou3OWjGEdHE59ObJF7cwRJa
xZe1o5WqvRvj7eYQdqxAWtnmWwcQ5wkZTkWRW3kcU8Rzfdli9Gs=
=p5gJ
-----END PGP SIGNATURE-----

--Apple-Mail=_2B7A53DC-1CFC-440F-9207-9F623ED30540--