Received-SPF: pass (google.com: domain of linux-kernel+bounces-177645-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Sun, 12 May 2024 10:05:11 +0200
From: Jan Kara <jack@suse.cz>
To: Justin Stitt <justinstitt@google.com>
Cc: Jan Kara <jack@suse.cz>, Alexander Viro <viro@zeniv.linux.org.uk>,
	Christian Brauner <brauner@kernel.org>,
	Nathan Chancellor <nathan@kernel.org>,
	Bill Wendling <morbo@google.com>, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org, llvm@lists.linux.dev,
	linux-hardening@vger.kernel.org
Subject: Re: [PATCH] fs: remove accidental overflow during wraparound check
Message-ID: <20240512080511.yotlypw35qowwjoh@quack3>
References: <20240507-b4-sio-vfs_fallocate-v1-1-322f84b97ad5@google.com>
 <20240509155356.w274h4blmcykxej6@quack3>
 <CAFhGd8opxHhTdZhDg_hq7XWQFxJ34nLDxTd-nBBgye9BLohnqw@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAFhGd8opxHhTdZhDg_hq7XWQFxJ34nLDxTd-nBBgye9BLohnqw@mail.gmail.com>

On Thu 09-05-24 15:10:07, Justin Stitt wrote:
> On Thu, May 9, 2024 at 8:53 AM Jan Kara <jack@suse.cz> wrote:
> > > @@ -319,8 +320,12 @@ int vfs_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
> > >       if (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))
> > >               return -ENODEV;
> > >
> > > -     /* Check for wrap through zero too */
> > > -     if (((offset + len) > inode->i_sb->s_maxbytes) || ((offset + len) < 0))
> > > +     /* Check for wraparound */
> > > +     if (check_add_overflow(offset, len, &sum))
> > > +             return -EFBIG;
> > > +
> > > +     /* Now, check bounds */
> > > +     if (sum > inode->i_sb->s_maxbytes || sum < 0)
> > >               return -EFBIG;
> >
> > But why do you check for sum < 0? We know from previous checks offset >= 0
> > && len > 0 so unless we overflow, sum is guaranteed to be > 0.
> 
> Fair enough. I suppose with the overflow check in place we can no
> longer have a sum less than zero there. If nothing else, it tells
> readers of this code what the domain of (offset+len) is. I don't mind
> sending a new version, though.

Well, for normal readers offset+len is always a positive number. That's
what you expect. If you see a check for offset+len < 0, you start wondering
what are you missing... only to find you miss nothing and the check is
pointless. So yes, please send a version without the pointless check.

								Honza

-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR