diff options
| author | David Miller <davem@davemloft.net> | 2007-11-13 00:02:56 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-16 08:27:37 -0800 |
| commit | c669e2ad32c2ab2bf4133ce8f7b96775b9c3db2b (patch) | |
| tree | 6513fccc71c1d5861e0884c6dadf4a2a30cc24b8 | |
| parent | eeb4e8c2aeda4f366bc14bea2a3a2e10cb7bc66d (diff) | |
Fix error returns in sys_socketpair()
patch bf3c23d171e35e6e168074a1514b0acd59cfd81a in mainline.
[NET]: Fix error reporting in sys_socketpair().
If either of the two sock_alloc_fd() calls fail, we
forget to update 'err' and thus we'll erroneously
return zero in these cases.
Based upon a report and patch from Rich Paul, and
commentary from Chuck Ebbert.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/socket.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index a0575243ef7a..8e5be7477c02 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1245,11 +1245,14 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, goto out_release_both; fd1 = sock_alloc_fd(&newfile1); - if (unlikely(fd1 < 0)) + if (unlikely(fd1 < 0)) { + err = fd1; goto out_release_both; + } fd2 = sock_alloc_fd(&newfile2); if (unlikely(fd2 < 0)) { + err = fd2; put_filp(newfile1); put_unused_fd(fd1); goto out_release_both; |