[PATCH 10/11] fs: remove the access_ok() check in ioctl_fiemap
From: Christoph Hellwig <hch@lst.de>
Date: 2020-05-05 15:44:04
Also in:
linux-fsdevel, linux-unionfs
Subsystem:
filesystems (vfs and infrastructure), landlock security module, the rest · Maintainers:
Alexander Viro, Christian Brauner, Mickaël Salaün, Linus Torvalds
access_ok just checks we are fed a proper user pointer. We also do that in copy_to_user itself, so no need to do this early. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ritesh Harjani <redacted> Reviewed-by: Darrick J. Wong <redacted> --- fs/ioctl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/fs/ioctl.c b/fs/ioctl.c
index b16e962340db6..d69786d1dd911 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c@@ -213,13 +213,9 @@ static int ioctl_fiemap(struct file *filp, struct fiemap __user *ufiemap) fieinfo.fi_extents_max = fiemap.fm_extent_count; fieinfo.fi_extents_start = ufiemap->fm_extents; - if (fiemap.fm_extent_count != 0 && - !access_ok(fieinfo.fi_extents_start, - fieinfo.fi_extents_max * sizeof(struct fiemap_extent))) - return -EFAULT; - error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, fiemap.fm_length); + fiemap.fm_flags = fieinfo.fi_flags; fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped; if (copy_to_user(ufiemap, &fiemap, sizeof(fiemap)))
--
2.26.2