[PATCH v9 05/16] dax: remove the last BUG_ON() from fs/dax.c
From: Ross Zwisler <hidden>
Date: 2016-11-01 19:54:07
Also in:
linux-fsdevel, linux-mm, linux-xfs, lkml, nvdimm
Subsystem:
filesystem direct access (dax), filesystems (vfs and infrastructure), the rest · Maintainers:
Dan Williams, Alexander Viro, Christian Brauner, Linus Torvalds
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-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Reviewed-by: Christoph Hellwig <redacted> Reviewed-by: Jan Kara <redacted> --- fs/dax.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/dax.c b/fs/dax.c
index e52e754..219fa2b 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