diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-05 22:13:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-05 22:13:32 +0200 |
| commit | 3bad2f1c676581d01e7645eb03e9b27e28b0a92e (patch) | |
| tree | 7e946eb2c7dab8c08e473ee1249be9a814728158 /net/socket.c | |
| parent | Cavium CNN55XX: fix broken default Kconfig entry (diff) | |
| parent | Switch flock copyin/copyout primitives to copy_{from,to}_user() (diff) | |
| download | linux-3bad2f1c676581d01e7645eb03e9b27e28b0a92e.tar.xz linux-3bad2f1c676581d01e7645eb03e9b27e28b0a92e.zip | |
Merge branch 'work.misc-set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc user access cleanups from Al Viro:
"The first pile is assorted getting rid of cargo-culted access_ok(),
cargo-culted set_fs() and field-by-field copyouts.
The same description applies to a lot of stuff in other branches -
this is just the stuff that didn't fit into a more specific topical
branch"
* 'work.misc-set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
Switch flock copyin/copyout primitives to copy_{from,to}_user()
fs/fcntl: return -ESRCH in f_setown when pid/pgid can't be found
fs/fcntl: f_setown, avoid undefined behaviour
fs/fcntl: f_setown, allow returning error
lpfc debugfs: get rid of pointless access_ok()
adb: get rid of pointless access_ok()
isdn: get rid of pointless access_ok()
compat statfs: switch to copy_to_user()
fs/locks: don't mess with the address limit in compat_fcntl64
nfsd_readlink(): switch to vfs_get_link()
drbd: ->sendpage() never needed set_fs()
fs/locks: pass kernel struct flock to fcntl_getlk/setlk
fs: locks: Fix some troubles at kernel-doc comments
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index 8f9dab330d57..59e902b9df09 100644 --- a/net/socket.c +++ b/net/socket.c @@ -991,8 +991,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) err = -EFAULT; if (get_user(pid, (int __user *)argp)) break; - f_setown(sock->file, pid, 1); - err = 0; + err = f_setown(sock->file, pid, 1); break; case FIOGETOWN: case SIOCGPGRP: |