system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-17 16:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

gadget/f_mass_storage: stop messing with the address limit

Browse source 
Instead use kernel_read/write consistently, which also makes sparse
happy.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Christoph Hellwig 2017-09-01 17:39:21 +02:00 committed by Al Viro
parent 21cb2559eb
commit 05a4a33b6d
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/usb/gadget/function/f_mass_storage.c
View file

@ -686,9 +686,8 @@ static int do_read(struct fsg_common *common)
/* Perform the read */ /* Perform the read */
file_offset_tmp = file_offset; file_offset_tmp = file_offset;
nread = vfs_read(curlun->filp, nread = kernel_read(curlun->filp, bh->buf, amount,
(char __user *)bh->buf, &file_offset_tmp);
amount, &file_offset_tmp);
VLDBG(curlun, "file read %u @ %llu -> %d\n", amount, VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
(unsigned long long)file_offset, (int)nread); (unsigned long long)file_offset, (int)nread);
if (signal_pending(current)) if (signal_pending(current))
@ -883,8 +882,8 @@ static int do_write(struct fsg_common *common)
/* Perform the write */ /* Perform the write */
file_offset_tmp = file_offset; file_offset_tmp = file_offset;
nwritten = vfs_write(curlun->filp, (char __user *)bh->buf, nwritten = kernel_write(curlun->filp, bh->buf, amount,
amount, &file_offset_tmp); &file_offset_tmp);
VLDBG(curlun, "file write %u @ %llu -> %d\n", amount, VLDBG(curlun, "file write %u @ %llu -> %d\n", amount,
(unsigned long long)file_offset, (int)nwritten); (unsigned long long)file_offset, (int)nwritten);
if (signal_pending(current)) if (signal_pending(current))
@ -1021,9 +1020,8 @@ static int do_verify(struct fsg_common *common)
/* Perform the read */ /* Perform the read */
file_offset_tmp = file_offset; file_offset_tmp = file_offset;
nread = vfs_read(curlun->filp, nread = kernel_read(curlun->filp, bh->buf, amount,
(char __user *) bh->buf, &file_offset_tmp);
amount, &file_offset_tmp);
VLDBG(curlun, "file read %u @ %llu -> %d\n", amount, VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
(unsigned long long) file_offset, (unsigned long long) file_offset,
(int) nread); (int) nread);
@ -2453,13 +2451,6 @@ static int fsg_main_thread(void *common_)
/* Allow the thread to be frozen */ /* Allow the thread to be frozen */
set_freezable(); 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 */ /* The main loop */
while (common->state != FSG_STATE_TERMINATED) { while (common->state != FSG_STATE_TERMINATED) {
if (exception_in_progress(common) || signal_pending(current)) { if (exception_in_progress(common) || signal_pending(current)) {