Commit ce4bb04c authored Jan 10, 2018 by Al Viro

Fix a leak in socket(2) when we fail to allocate a file descriptor.



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: 8e1611e2 (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>

parent 040ee692

net/socket.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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))) {

Admin message