Messages in this thread Patch in this message | | | Date | Mon, 19 Nov 2007 10:18:54 -0800 | From | Greg Kroah-Hartman <> | Subject | [patch 10/26] Fix error returns in sys_socketpair() |
| |
2.6.22-stable review patch. If anyone has any objections, please let us know.
------------------ From: David Miller <davem@davemloft.net>
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>
--- net/socket.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
--- a/net/socket.c +++ b/net/socket.c @@ -1246,11 +1246,14 @@ asmlinkage long sys_socketpair(int famil 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 linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |