Skip to content

Commit

Permalink
[NET]: Fix error reporting in sys_socketpair().
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed Oct 30, 2007
1 parent 29b6749 commit bf3c23d
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion net/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -1250,11 +1250,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;
Expand Down

0 comments on commit bf3c23d

Please sign in to comment.