Commit 2c41b3c3 authored by David Miller's avatar David Miller Committed by Greg Kroah-Hartman

Fix error returns in sys_socketpair()

patch bf3c23d1 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: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d6eb5c86
...@@ -1246,11 +1246,14 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, ...@@ -1246,11 +1246,14 @@ asmlinkage long sys_socketpair(int family, int type, int protocol,
goto out_release_both; goto out_release_both;
fd1 = sock_alloc_fd(&newfile1); fd1 = sock_alloc_fd(&newfile1);
if (unlikely(fd1 < 0)) if (unlikely(fd1 < 0)) {
err = fd1;
goto out_release_both; goto out_release_both;
}
fd2 = sock_alloc_fd(&newfile2); fd2 = sock_alloc_fd(&newfile2);
if (unlikely(fd2 < 0)) { if (unlikely(fd2 < 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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment