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()
Date: Mon, 30 Mar 2020 15:27:12 +0200 [thread overview]
Message-ID: <20200330132712.ckevhpof4vrsx5rw@work> (raw)
In-Reply-To: <20200330090932.29445-3-jack@suse.cz>
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
>
next prev parent reply other threads:[~2020-03-30 13:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 9:09 [PATCH 0/2] Fixes for dir_index support in libext2fs Jan Kara
2020-03-30 9:09 ` [PATCH 1/2] ext2fs: Fix error checking in dx_link() Jan Kara
2020-03-30 13:24 ` Lukas Czerner
2020-03-30 13:48 ` Lukas Czerner
2020-03-30 14:55 ` Jan Kara
2020-04-10 3:52 ` Theodore Y. Ts'o
2020-03-30 9:09 ` [PATCH 2/2] ext2fs: Fix off-by-one in dx_grow_tree() Jan Kara
2020-03-30 13:27 ` Lukas Czerner [this message]
2020-03-30 14:55 ` Jan Kara
2020-03-31 11:33 ` Lukas Czerner
2020-03-31 14:30 ` Jan Kara
2020-04-10 4:33 ` Theodore Y. Ts'o
2020-04-10 15:09 ` Jan Kara
2020-04-10 4:32 ` Theodore Y. Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200330132712.ckevhpof4vrsx5rw@work \
--to=lczerner@redhat.com \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox