| Message ID | 1475874544-24842-8-git-send-email-ross.zwisler@linux.intel.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Looks fine,
Reviewed-by: Christoph Hellwig <hch@lst.de>
On Fri 07-10-16 15:08:54, Ross Zwisler wrote: > Don't take down the kernel if we get an invalid 'from' and 'length' > argument pair. Just warn once and return an error. > > Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> Looks good. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/dax.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/dax.c b/fs/dax.c > index ac28cdf..98189ac 100644 > --- a/fs/dax.c > +++ b/fs/dax.c > @@ -1194,7 +1194,8 @@ int dax_zero_page_range(struct inode *inode, loff_t from, unsigned length, > /* Block boundary? Nothing to do */ > if (!length) > return 0; > - BUG_ON((offset + length) > PAGE_SIZE); > + if (WARN_ON_ONCE((offset + length) > PAGE_SIZE)) > + return -EINVAL; > > memset(&bh, 0, sizeof(bh)); > bh.b_bdev = inode->i_sb->s_bdev; > -- > 2.7.4 > >
diff --git a/fs/dax.c b/fs/dax.c index ac28cdf..98189ac 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1194,7 +1194,8 @@ int dax_zero_page_range(struct inode *inode, loff_t from, unsigned length, /* Block boundary? Nothing to do */ if (!length) return 0; - BUG_ON((offset + length) > PAGE_SIZE); + if (WARN_ON_ONCE((offset + length) > PAGE_SIZE)) + return -EINVAL; memset(&bh, 0, sizeof(bh)); bh.b_bdev = inode->i_sb->s_bdev;
Don't take down the kernel if we get an invalid 'from' and 'length' argument pair. Just warn once and return an error. Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> --- fs/dax.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)