From: Liu Bo <bo.li.liu@oracle.com>
To: dsterba@suse.cz
Cc: "Holger Hoffstätte" <holger@applied-asynchrony.com>,
linux-btrfs@vger.kernel.org
Subject: Re: [PATCH] Btrfs: check btree node's nritems
Date: Tue, 23 Aug 2016 17:26:07 -0700 [thread overview]
Message-ID: <20160824002607.GB2613@localhost.localdomain> (raw)
In-Reply-To: <20160816165000.GR30795@twin.jikos.cz>
On Tue, Aug 16, 2016 at 06:50:00PM +0200, David Sterba wrote:
> On Wed, Aug 03, 2016 at 12:57:28PM -0700, Liu Bo wrote:
> > When btree node (level = 1) has nritems which equals to zero,
> > we can end up with panic due to insert_ptr()'s
> >
> > BUG_ON(slot > nritems);
> >
> > where slot is 1 and nritems is 0, as copy_for_split() calls
> > insert_ptr(.., path->slots[1] + 1, ...);
> >
> > A invalid value results in the whole mess, this adds the check
> > for btree's node nritems so that we stop reading block when
> > when something is wrong.
> >
> > Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
> > ---
> > fs/btrfs/disk-io.c | 17 +++++++++++++++++
> > 1 file changed, 17 insertions(+)
> >
> > diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> > index 37d1780..a5a22be 100644
> > --- a/fs/btrfs/disk-io.c
> > +++ b/fs/btrfs/disk-io.c
> > @@ -612,6 +612,20 @@ static noinline int check_leaf(struct btrfs_root *root,
> > return 0;
> > }
> >
> > +static noinline int check_node(struct btrfs_root *root,
> > + struct extent_buffer *node)
> > +{
> > + unsigned long nr = btrfs_header_nritems(node);
> > +
> > + if (nr <= 0 || nr >= BTRFS_NODEPTRS_PER_BLOCK(root)) {
>
> nr is unsigned, so it's just "== 0"
>
> and the BTRFS_NODEPTRS_PER_BLOCK value is inclusive, which should
> explain Holger's findings.
>
> 493 * sizeof (btrfs_key_ptr) + sizeof (btrfs_header) + slack = nodesize
>
> 493 * 33 + 101 + slack = 16k (the closest value)
>
> gives slack = 14 (smaller than sizeof (btrfs_key_ptr))
Oh, right, I made a mistake when getting the assumption from insert_ptr(), it should be nr > BTRFS_NODEPTRS_PER_BLOCK(root).
Thanks,
-liubo
next prev parent reply other threads:[~2016-08-24 0:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-03 19:57 [PATCH] Btrfs: check btree node's nritems Liu Bo
2016-08-05 9:24 ` Holger Hoffstätte
2016-08-05 10:29 ` Holger Hoffstätte
2016-08-16 16:50 ` David Sterba
2016-08-24 0:26 ` Liu Bo [this message]
2016-08-24 0:37 ` [PATCH v2] " Liu Bo
2016-08-24 11:49 ` David Sterba
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=20160824002607.GB2613@localhost.localdomain \
--to=bo.li.liu@oracle.com \
--cc=dsterba@suse.cz \
--cc=holger@applied-asynchrony.com \
--cc=linux-btrfs@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).