Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bf3c23d171e35e6e168074a1514b0acd59cfd81a
Commit:     bf3c23d171e35e6e168074a1514b0acd59cfd81a
Parent:     29b67497f256399c4aa2adec27ab7ba24bba44e8
Author:     David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 29 21:54:02 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Oct 29 22:37:34 2007 -0700

    [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 <[EMAIL PROTECTED]>
---
 net/socket.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/net/socket.c b/net/socket.c
index 540013e..5d879fd 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to