From: Christoph Hellwig <hch@lst.de>
To: linux-ext4@vger.kernel.org, viro@zeniv.linux.org.uk
Cc: jack@suse.cz, tytso@mit.edu, adilger@dilger.ca,
riteshh@linux.ibm.com, amir73il@gmail.com,
linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org,
"Darrick J . Wong" <darrick.wong@oracle.com>
Subject: [PATCH 8/9] fs: remove the access_ok() check in ioctl_fiemap
Date: Sat, 23 May 2020 09:30:15 +0200 [thread overview]
Message-ID: <20200523073016.2944131-9-hch@lst.de> (raw)
In-Reply-To: <20200523073016.2944131-1-hch@lst.de>
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 <riteshh@linux.ibm.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
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
next prev parent reply other threads:[~2020-05-23 7:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-23 7:30 fiemap cleanups v4 Christoph Hellwig
2020-05-23 7:30 ` [PATCH 1/9] ext4: split _ext4_fiemap Christoph Hellwig
2020-05-23 7:30 ` [PATCH 2/9] ext4: remove the call to fiemap_check_flags in ext4_fiemap Christoph Hellwig
2020-05-23 7:30 ` [PATCH 3/9] fs: mark __generic_block_fiemap static Christoph Hellwig
2020-05-23 7:30 ` [PATCH 4/9] fs: move the fiemap definitions out of fs.h Christoph Hellwig
2020-05-23 7:30 ` [PATCH 5/9] iomap: fix the iomap_fiemap prototype Christoph Hellwig
2020-05-23 7:30 ` [PATCH 6/9] fs: move fiemap range validation into the file systems instances Christoph Hellwig
2020-05-26 16:25 ` Darrick J. Wong
2020-05-23 7:30 ` [PATCH 7/9] fs: handle FIEMAP_FLAG_SYNC in fiemap_prep Christoph Hellwig
2020-05-23 7:30 ` Christoph Hellwig [this message]
2020-05-23 7:30 ` [PATCH 9/9] ext4: remove the access_ok() check in ext4_ioctl_get_es_cache Christoph Hellwig
2020-05-23 15:52 ` fiemap cleanups v4 Al Viro
2020-05-24 11:57 ` Christoph Hellwig
2020-05-24 19:17 ` Theodore Y. Ts'o
2020-05-25 6:52 ` Christoph Hellwig
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=20200523073016.2944131-9-hch@lst.de \
--to=hch@lst.de \
--cc=adilger@dilger.ca \
--cc=amir73il@gmail.com \
--cc=darrick.wong@oracle.com \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=riteshh@linux.ibm.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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;
as well as URLs for NNTP newsgroup(s).