adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

reorder alloc_fd/attach_fd in socketpair()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2009-08-05 19:29:23 +04:00
parent 732741274d
commit 198de4d7ac
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
net/socket.c
View file

@ -1396,23 +1396,30 @@ SYSCALL_DEFINE4(socketpair, int, family, int, type, int, protocol,
goto out_release_both; goto out_release_both;
} }
fd2 = sock_alloc_fd(&newfile2, flags & O_CLOEXEC); err = sock_attach_fd(sock1, newfile1, flags & O_NONBLOCK);
if (unlikely(fd2 < 0)) { if (unlikely(err < 0)) {
err = fd2;
put_filp(newfile1); put_filp(newfile1);
put_unused_fd(fd1); put_unused_fd(fd1);
goto out_release_both; goto out_release_both;
} }
err = sock_attach_fd(sock1, newfile1, flags & O_NONBLOCK); fd2 = sock_alloc_fd(&newfile2, flags & O_CLOEXEC);
if (unlikely(err < 0)) { if (unlikely(fd2 < 0)) {
goto out_fd2; err = fd2;
fput(newfile1);
put_unused_fd(fd1);
sock_release(sock2);
goto out;
} }
err = sock_attach_fd(sock2, newfile2, flags & O_NONBLOCK); err = sock_attach_fd(sock2, newfile2, flags & O_NONBLOCK);
if (unlikely(err < 0)) { if (unlikely(err < 0)) {
put_filp(newfile2);
put_unused_fd(fd2);
fput(newfile1); fput(newfile1);
goto out_fd1; put_unused_fd(fd1);
sock_release(sock2);
goto out;
} }
audit_fd_pair(fd1, fd2); audit_fd_pair(fd1, fd2);
@ -1438,16 +1445,6 @@ out_release_1:
sock_release(sock1); sock_release(sock1);
out: out:
return err; return err;
out_fd2:
put_filp(newfile1);
sock_release(sock1);
out_fd1:
put_filp(newfile2);
sock_release(sock2);
put_unused_fd(fd1);
put_unused_fd(fd2);
goto out;
} }
/* /*