diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2017-06-13 13:35:50 +0200 |
|---|---|---|
| committer | Jeff Layton <jlayton@redhat.com> | 2017-06-14 08:46:36 -0400 |
| commit | 393cc3f51135ea2520521f776ef3afdf3395c797 (patch) | |
| tree | 39e155523cb90f73b234ebf1bf3a580ba0ab1e36 /net/socket.c | |
| parent | 94073ad77fff221b5e66b8b9863a546ba212d6a3 (diff) | |
fs/fcntl: f_setown, allow returning error
Allow f_setown to return an error value. We will fail in the next patch
with EINVAL for bad input to f_setown, so tile the path for the later
patch.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Cc: Jeff Layton <jlayton@poochiereds.net>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Jeff Layton <jlayton@redhat.com>
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 c2564eb25c6b..a30a1e324390 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: |