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;
Date:   Mon, 30 Mar 2020 15:27:12 +0200
From:   Lukas Czerner <lczerner@redhat.com>
To:     Jan Kara <jack@suse.cz>
Cc:     Ted Tso <tytso@mit.edu>, linux-ext4@vger.kernel.org
Subject: Re: [PATCH 2/2] ext2fs: Fix off-by-one in dx_grow_tree()
Message-ID: <20200330132712.ckevhpof4vrsx5rw@work>
References: <20200330090932.29445-1-jack@suse.cz>
 <20200330090932.29445-3-jack@suse.cz>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200330090932.29445-3-jack@suse.cz>
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk

On Mon, Mar 30, 2020 at 11:09:32AM +0200, Jan Kara wrote:
> There is an off-by-one error in dx_grow_tree() when checking whether we
> can add another level to the tree. Thus we can grow tree too much
> leading to possible crashes in the library or corrupted filesystem. Fix
> the bug.

Looks good, thanks

Reviewed-by: Lukas Czerner <lczerner@redhat.com>

Don't we have basically the same off-by-one in
e2fsck/pass1.c handle_htree() ?

       if ((root->indirect_levels > ext2_dir_htree_level(fs)) &&
           fix_problem(ctx, PR_1_HTREE_DEPTH, pctx))

-Lukas

> 
> Signed-off-by: Jan Kara <jack@suse.cz>
> ---
>  lib/ext2fs/link.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/ext2fs/link.c b/lib/ext2fs/link.c
> index 7b5bb022117c..469eea8cd06d 100644
> --- a/lib/ext2fs/link.c
> +++ b/lib/ext2fs/link.c
> @@ -473,7 +473,7 @@ static errcode_t dx_grow_tree(ext2_filsys fs, ext2_ino_t dir,
>  		    ext2fs_le16_to_cpu(info->frames[i].head->limit))
>  			break;
>  	/* Need to grow tree depth? */
> -	if (i < 0 && info->levels > ext2_dir_htree_level(fs))
> +	if (i < 0 && info->levels >= ext2_dir_htree_level(fs))
>  		return EXT2_ET_DIR_NO_SPACE;
>  	lblk = size / fs->blocksize;
>  	size += fs->blocksize;
> -- 
> 2.16.4
>