diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-06-26 23:52:33 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-06-26 23:52:33 -0400 |
| commit | ca1579f6c6085ecb1838d9ee052e535682cc0e73 (patch) | |
| tree | 492bbb19183f84545026f91ecf23957796be8de8 /net/socket.c | |
| parent | 20dcf8e244b963a5c64cdda336d00d5169d17985 (diff) | |
| parent | f73127356f344483c82632accda2e72b7e0e5f25 (diff) | |
| download | net-ca1579f6c6085ecb1838d9ee052e535682cc0e73.tar.gz | |
Merge remote-tracking branch 'jl/locks-4.13' into work.misc-set_fs
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 c2564eb25c6b8f..a30a1e324390f3 100644 --- a/net/socket.c +++ b/net/socket.c @@ -950,8 +950,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: |