From: Christoph Hellwig <hch@lst.de>
To: viro@zeniv.linux.org.uk
Cc: arve@android.com, riandrews@android.com,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 13/17] gadget/f_mass_storage: stop messing with the address limit
Date: Fri, 1 Sep 2017 17:39:21 +0200 [thread overview]
Message-ID: <20170901153925.30578-14-hch@lst.de> (raw)
In-Reply-To: <20170901153925.30578-1-hch@lst.de>
Instead use kernel_read/write consistently, which also makes sparse
happy.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/usb/gadget/function/f_mass_storage.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
index f95bddd6513f..d6bd0244b008 100644
--- a/drivers/usb/gadget/function/f_mass_storage.c
+++ b/drivers/usb/gadget/function/f_mass_storage.c
@@ -686,9 +686,8 @@ static int do_read(struct fsg_common *common)
/* Perform the read */
file_offset_tmp = file_offset;
- nread = vfs_read(curlun->filp,
- (char __user *)bh->buf,
- amount, &file_offset_tmp);
+ nread = kernel_read(curlun->filp, bh->buf, amount,
+ &file_offset_tmp);
VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
(unsigned long long)file_offset, (int)nread);
if (signal_pending(current))
@@ -883,8 +882,8 @@ static int do_write(struct fsg_common *common)
/* Perform the write */
file_offset_tmp = file_offset;
- nwritten = vfs_write(curlun->filp, (char __user *)bh->buf,
- amount, &file_offset_tmp);
+ nwritten = kernel_write(curlun->filp, bh->buf, amount,
+ &file_offset_tmp);
VLDBG(curlun, "file write %u @ %llu -> %d\n", amount,
(unsigned long long)file_offset, (int)nwritten);
if (signal_pending(current))
@@ -1021,9 +1020,8 @@ static int do_verify(struct fsg_common *common)
/* Perform the read */
file_offset_tmp = file_offset;
- nread = vfs_read(curlun->filp,
- (char __user *) bh->buf,
- amount, &file_offset_tmp);
+ nread = kernel_read(curlun->filp, bh->buf, amount,
+ &file_offset_tmp);
VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
(unsigned long long) file_offset,
(int) nread);
@@ -2453,13 +2451,6 @@ static int fsg_main_thread(void *common_)
/* Allow the thread to be frozen */
set_freezable();
- /*
- * Arrange for userspace references to be interpreted as kernel
- * pointers. That way we can pass a kernel pointer to a routine
- * that expects a __user pointer and it will work okay.
- */
- set_fs(get_ds());
-
/* The main loop */
while (common->state != FSG_STATE_TERMINATED) {
if (exception_in_progress(common) || signal_pending(current)) {
--
2.11.0
next prev parent reply other threads:[~2017-09-01 15:39 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-01 15:39 switch in-kernel read/write calls to kernel_read/write V2 Christoph Hellwig
2017-09-01 15:39 ` [PATCH 01/17] ashmem: switch to ->read_iter Christoph Hellwig
2017-09-01 15:39 ` [PATCH 02/17] autofs4: switch autofs4_write to __kernel_write Christoph Hellwig
2017-09-01 15:39 ` [PATCH 03/17] fs: move kernel_write to fs/read_write.c Christoph Hellwig
2017-09-01 15:39 ` [PATCH 04/17] fs: move kernel_read " Christoph Hellwig
2017-09-01 15:39 ` [PATCH 05/17] fs: fix kernel_read prototype Christoph Hellwig
2017-09-01 15:39 ` [PATCH 06/17] fs: fix kernel_write prototype Christoph Hellwig
2017-09-01 15:39 ` [PATCH 07/17] fs: make the buf argument to __kernel_write a void pointer Christoph Hellwig
2017-09-01 15:39 ` [PATCH 08/17] serial2002: switch serial2002_tty_write to kernel_{read/write} Christoph Hellwig
2017-09-01 15:39 ` [PATCH 09/17] mm/nommu: switch do_mmap_private to kernel_read Christoph Hellwig
2017-09-01 15:39 ` [PATCH 10/17] net/9p: switch p9_fd_read to kernel_write Christoph Hellwig
2017-09-01 15:39 ` [PATCH 11/17] btrfs: switch write_buf " Christoph Hellwig
2017-09-01 15:39 ` [PATCH 12/17] mconsole: switch to kernel_read Christoph Hellwig
2017-09-01 15:39 ` Christoph Hellwig [this message]
2017-09-01 15:39 ` [PATCH 14/17] lustre: switch to kernel_write Christoph Hellwig
2017-09-01 15:39 ` [PATCH 15/17] fs: unexport __vfs_read/__vfs_write Christoph Hellwig
2017-09-01 15:39 ` [PATCH 16/17] fs: unexport vfs_read and vfs_write Christoph Hellwig
2017-09-01 15:39 ` [PATCH 17/17] fs: unexport vfs_readv and vfs_writev 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=20170901153925.30578-14-hch@lst.de \
--to=hch@lst.de \
--cc=arve@android.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=riandrews@android.com \
--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).