summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorJeff Layton2014-08-22 17:27:32 +0200
committerJeff Layton2014-09-09 22:01:36 +0200
commite0b93eddfe17dcb7d644eb5d6ad02a86fc41a977 (patch)
tree97ceab83fdbfd3bf54fd8235a66da665fbcc83a7 /net/socket.c
parentlocks: consolidate "nolease" routines (diff)
downloadkernel-qcow2-linux-e0b93eddfe17dcb7d644eb5d6ad02a86fc41a977.tar.gz
kernel-qcow2-linux-e0b93eddfe17dcb7d644eb5d6ad02a86fc41a977.tar.xz
kernel-qcow2-linux-e0b93eddfe17dcb7d644eb5d6ad02a86fc41a977.zip
security: make security_file_set_fowner, f_setown and __f_setown void return
security_file_set_fowner always returns 0, so make it f_setown and __f_setown void return functions and fix up the error handling in the callers. Cc: linux-security-module@vger.kernel.org Signed-off-by: Jeff Layton <jlayton@primarydata.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c
index 95ee7d8682e7..769c9671847e 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1069,7 +1069,8 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
err = -EFAULT;
if (get_user(pid, (int __user *)argp))
break;
- err = f_setown(sock->file, pid, 1);
+ f_setown(sock->file, pid, 1);
+ err = 0;
break;
case FIOGETOWN:
case SIOCGPGRP: