diff options
author | Jeff Layton <jlayton@primarydata.com> | 2014-08-22 15:27:32 (GMT) |
---|---|---|
committer | Jeff Layton <jlayton@primarydata.com> | 2014-09-09 20:01:36 (GMT) |
commit | e0b93eddfe17dcb7d644eb5d6ad02a86fc41a977 (patch) | |
tree | 97ceab83fdbfd3bf54fd8235a66da665fbcc83a7 /drivers | |
parent | 1c994a0909a556508c2cc26ab5d9e13c5ce33aa0 (diff) | |
download | linux-e0b93eddfe17dcb7d644eb5d6ad02a86fc41a977.tar.xz |
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 'drivers')
-rw-r--r-- | drivers/net/tun.c | 4 | ||||
-rw-r--r-- | drivers/tty/tty_io.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index acaaf67..186ce54 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2152,9 +2152,7 @@ static int tun_chr_fasync(int fd, struct file *file, int on) goto out; if (on) { - ret = __f_setown(file, task_pid(current), PIDTYPE_PID, 0); - if (ret) - goto out; + __f_setown(file, task_pid(current), PIDTYPE_PID, 0); tfile->flags |= TUN_FASYNC; } else tfile->flags &= ~TUN_FASYNC; diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 8fbad34..aea3b66 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2163,8 +2163,9 @@ static int __tty_fasync(int fd, struct file *filp, int on) } get_pid(pid); spin_unlock_irqrestore(&tty->ctrl_lock, flags); - retval = __f_setown(filp, pid, type, 0); + __f_setown(filp, pid, type, 0); put_pid(pid); + retval = 0; } out: return retval; |