From: Dan Carpenter <dan.carpenter@oracle.com>
To: Ben Myers <bpm@sgi.com>
Cc: Alex Elder <elder@kernel.org>,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
xfs@oss.sgi.com, Jeff Liu <jeff.liu@oracle.com>,
Dave Chinner <david@fromorbit.com>
Subject: Re: [patch] xfs: check for underflow in xfs_iformat_fork()
Date: Mon, 26 Aug 2013 17:37:15 +0300 [thread overview]
Message-ID: <20130826143714.GA6329@mwanda> (raw)
In-Reply-To: <20130823173613.GT5262@sgi.com>
On Fri, Aug 23, 2013 at 12:36:13PM -0500, Ben Myers wrote:
> Dan,
>
> On Fri, Aug 16, 2013 at 08:26:50AM +1000, Dave Chinner wrote:
> > On Thu, Aug 15, 2013 at 09:37:06AM -0500, Ben Myers wrote:
> > > Hey Dan & Jeff,
> > >
> > > On Thu, Aug 15, 2013 at 06:10:43PM +0800, Jeff Liu wrote:
> > > > On 08/15/2013 01:53 PM, Dan Carpenter wrote:
> > > >
> > > > > The "di_size" variable comes from the disk and it's a signed 64 bit.
> > > > > We check the upper limit but we should check for negative numbers as
> > > > > well.
> > > > >
> > > > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > > > >
> > > > > diff --git a/fs/xfs/xfs_inode_fork.c b/fs/xfs/xfs_inode_fork.c
> > > > > index 123971b..849fc70 100644
> > > > > --- a/fs/xfs/xfs_inode_fork.c
> > > > > +++ b/fs/xfs/xfs_inode_fork.c
> > > > > @@ -167,7 +167,8 @@ xfs_iformat_fork(
> > > > > }
> > > > >
> > > > > di_size = be64_to_cpu(dip->di_size);
> > > > > - if (unlikely(di_size > XFS_DFORK_DSIZE(dip, ip->i_mount))) {
> > > > > + if (unlikely(di_size < 0 ||
> > > >
> > > > But the di_size is initialized to ZERO while allocating a new inode on disk.
> > > > I wonder if that is better to ASSERT in this case because the current check
> > > > is used to make sure that the item is inlined, or we don't need it at all.
> > >
> > > Hmm. Dan's additional check looks good to me. In this case I'd say the forced
> > > shutdown is more appropriate than an assert, because here we're reading the
> > > inode from disk, as opposed to looking at a structure that is already incore
> > > which we think we've initialized. We want to handle unexpected inputs from
> > > disk without crashing even if we are CONFIG_XFS_DEBUG.
> >
> > There are lots of places where we only check di_size to be greater
> > than some value, and don't check for it being less than zero. Hence
> > I think that a better solution might be to di_size unsigned as that
> > will catch "negative" sizes for all types of situations.
>
> What do you say to making di_size unsigned? Any interest?
>
I'm not the right person to change "lots of places". Some of these
are probably subtle. Just give me the reported-by and I'm happy.
regards,
dan carpenter
next prev parent reply other threads:[~2013-08-26 14:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-15 5:53 [patch] xfs: check for underflow in xfs_iformat_fork() Dan Carpenter
2013-08-15 10:10 ` Jeff Liu
2013-08-15 14:37 ` Ben Myers
2013-08-15 15:47 ` Dan Carpenter
2013-08-15 22:26 ` Dave Chinner
2013-08-23 17:36 ` Ben Myers
2013-08-26 14:37 ` Dan Carpenter [this message]
2013-08-26 16:12 ` Ben Myers
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=20130826143714.GA6329@mwanda \
--to=dan.carpenter@oracle.com \
--cc=bpm@sgi.com \
--cc=david@fromorbit.com \
--cc=elder@kernel.org \
--cc=jeff.liu@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/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