Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 12 Oct 2022 10:03:03 +0100
From:   =?iso-8859-1?Q?Lu=EDs?= Henriques <lhenriques@suse.de>
To:     Theodore Ts'o <tytso@mit.edu>
Cc:     Andreas Dilger <adilger.kernel@dilger.ca>,
        linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
        stable@vger.kernel.org
Subject: Re: [PATCH] ext4: fix BUG_ON() when a directory entry has an invalid
 rec_len
Message-ID: <Y0aCx45PBQrde4IC@suse.de>
References: <20221011155745.15264-1-lhenriques@suse.de>
 <Y0YQ42Z/XPuHZRS8@mit.edu>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <Y0YQ42Z/XPuHZRS8@mit.edu>
Precedence: bulk

On Tue, Oct 11, 2022 at 08:57:07PM -0400, Theodore Ts'o wrote:
> On Tue, Oct 11, 2022 at 04:57:45PM +0100, Lu?s Henriques wrote:
> > diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
> > index 3a31b662f661..06803292e394 100644
> > --- a/fs/ext4/namei.c
> > +++ b/fs/ext4/namei.c
> > @@ -2254,8 +2254,18 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname,
> >  	memset(de, 0, len); /* wipe old data */
> >  	de = (struct ext4_dir_entry_2 *) data2;
> >  	top = data2 + len;
> > -	while ((char *)(de2 = ext4_next_entry(de, blocksize)) < top)
> > +	while ((char *)(de2 = ext4_next_entry(de, blocksize)) < top) {
> > +		if (de->rec_len & 3) {
> 
> As the kernel test bot as flaged, de->rec_len needs to be byte swapped
> on big endian machines.  Also, for block sizes larger than 64k the low
> 2 bits are used to encode rec_len sizes 256k-4.  All of this is
> encoded in ext4_rec_len_from_disk().
> 
> However, I think a better thing to do is instead of doing this one
> check on rec len, that instead we call ext4_check_dir_entry(), which
> will do this check, and many more besides.  It will also avoid some
> code duplication, since it will take care of calling EXT4_ERROR_INODE
> with the appropriate explanatory message.

Awesome, thanks for the explanation, Ted.  I'll work on a v2 of the patch
that'll use ext4_check_dir_entry() and send it after running some tests
with it.  Thanks for the suggestion!

Cheers,
--
Lu?s