Skip to content

Commit

Permalink
Fix a leak in socket(2) when we fail to allocate a file descriptor.
Browse files Browse the repository at this point in the history
Got broken by "make sock_alloc_file() do sock_release() on failures" -
cleanup after sock_map_fd() failure got pulled all the way into
sock_alloc_file(), but it used to serve the case when sock_map_fd()
failed *before* getting to sock_alloc_file() as well, and that got
lost.  Trivial to fix, fortunately.

Fixes: 8e1611e (make sock_alloc_file() do sock_release() on failures)
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jan 10, 2018
1 parent 040ee69 commit ce4bb04
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion net/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -432,8 +432,10 @@ static int sock_map_fd(struct socket *sock, int flags)
{
struct file *newfile;
int fd = get_unused_fd_flags(flags);
if (unlikely(fd < 0))
if (unlikely(fd < 0)) {
sock_release(sock);
return fd;
}

newfile = sock_alloc_file(sock, flags, NULL);
if (likely(!IS_ERR(newfile))) {
Expand Down

0 comments on commit ce4bb04

Please sign in to comment.