diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-12-14 04:57:47 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-01-04 15:14:41 -0500 |
commit | 157cf649a735a2f7e8dba0ed08e6e38b6c30d886 (patch) | |
tree | 85895367c24023d363d5ee7b5ed2fb16eaf08721 /net/socket.c | |
parent | 564f6993ffef656aebaf46cf2f1f6cb4f5c97207 (diff) | |
download | linux-stable-157cf649a735a2f7e8dba0ed08e6e38b6c30d886.tar.gz linux-stable-157cf649a735a2f7e8dba0ed08e6e38b6c30d886.tar.bz2 linux-stable-157cf649a735a2f7e8dba0ed08e6e38b6c30d886.zip |
sanitize audit_fd_pair()
* no allocations
* return void
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/socket.c b/net/socket.c index b41a92093e40..06603d73c411 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1313,13 +1313,7 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, goto out_fd1; } - err = audit_fd_pair(fd1, fd2); - if (err < 0) { - fput(newfile1); - fput(newfile2); - goto out_fd; - } - + audit_fd_pair(fd1, fd2); fd_install(fd1, newfile1); fd_install(fd2, newfile2); /* fd1 and fd2 may be already another descriptors. @@ -1349,7 +1343,6 @@ out_fd2: out_fd1: put_filp(newfile2); sock_release(sock2); -out_fd: put_unused_fd(fd1); put_unused_fd(fd2); goto out; |