Commit 2d24d91b authored Nov 24, 2022 by Wang Hai Committed by Greg Kroah-Hartman Dec 08, 2022

net/9p: Fix a potential socket leak in p9_socket_open



[ Upstream commit dcc14cfd7debe11b825cb077e75d91d2575b4cb8 ]

Both p9_fd_create_tcp() and p9_fd_create_unix() will call
p9_socket_open(). If the creation of p9_trans_fd fails,
p9_fd_create_tcp() and p9_fd_create_unix() will return an
error directly instead of releasing the cscoket, which will
result in a socket leak.

This patch adds sock_release() to fix the leak issue.

Fixes: 6b18662e ("9p connect fixes")
Signed-off-by: Wang Hai <wanghai38@huawei.com>
ACKed-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 4720725e

net/9p/trans_fd.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -852,8 +852,10 @@ static int p9_socket_open(struct p9_client client, struct socket csocket)
	struct file *file;		struct file *file;

	p = kzalloc(sizeof(struct p9_trans_fd), GFP_KERNEL);		p = kzalloc(sizeof(struct p9_trans_fd), GFP_KERNEL);
	if (!p)		if (!p) {
			sock_release(csocket);
	return -ENOMEM;		return -ENOMEM;
			}

	csocket->sk->sk_allocation = GFP_NOIO;		csocket->sk->sk_allocation = GFP_NOIO;
	file = sock_alloc_file(csocket, 0, NULL);		file = sock_alloc_file(csocket, 0, NULL);