Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=79f4f6428f6ceb9af57330092271bda028c23a96 Commit: 79f4f6428f6ceb9af57330092271bda028c23a96 Parent: 165de5b7f2719c1984956504128545839762d635 Author: Alexey Dobriyan <[EMAIL PROTECTED]> AuthorDate: Mon Mar 26 14:09:52 2007 -0700 Committer: David S. Miller <[EMAIL PROTECTED]> CommitDate: Mon Mar 26 14:09:52 2007 -0700
[NET]: Correct accept(2) recovery after sock_attach_fd() * d_alloc() in sock_attach_fd() fails leaving ->f_dentry of new file NULL * bail out to out_fd label, doing fput()/__fput() on new file * but __fput() assumes valid ->f_dentry and dereferences it Signed-off-by: Alexey Dobriyan <[EMAIL PROTECTED]> Signed-off-by: David S. Miller <[EMAIL PROTECTED]> --- net/socket.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/net/socket.c b/net/socket.c index 9566e57..ea8f81a 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1381,7 +1381,7 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, err = sock_attach_fd(newsock, newfile); if (err < 0) - goto out_fd; + goto out_fd_simple; err = security_socket_accept(sock, newsock); if (err) @@ -1414,6 +1414,11 @@ out_put: fput_light(sock->file, fput_needed); out: return err; +out_fd_simple: + sock_release(newsock); + put_filp(newfile); + put_unused_fd(newfd); + goto out_put; out_fd: fput(newfile); put_unused_fd(newfd); - 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