Unverified Commit 02951cea authored Dec 20, 2024 by openeuler-ci-bot Committed by Gitee Dec 20, 2024

!14240 sunrpc: fix one UAF issue caused by sunrpc kernel tcp socket

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OUK5JM4A3KI6ZLRH6KEHARNS5BXVLV4G/ 
 
https://gitee.com/openeuler/kernel/issues/IB2WJ7 
 
Link:https://gitee.com/openeuler/kernel/pulls/14240

 

Reviewed-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: Yuan Can <yuancan@huawei.com>
Signed-off-by: Yuan Can <yuancan@huawei.com>

parents 82be4889 15f7dd41

net/sunrpc/svcsock.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1555,6 +1555,11 @@ static struct svc_xprt svc_create_socket(struct svc_serv serv,
		newlen = error;

		if (protocol == IPPROTO_TCP) {
		sock->sk->sk_net_refcnt = 1;
		get_net(net);
		#ifdef CONFIG_PROC_FS
		this_cpu_add(*net->core.sock_inuse, 1);
		#endif
		if ((error = kernel_listen(sock, 64)) < 0)
		goto bummer;
		}

net/sunrpc/xprtsock.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -2005,6 +2005,14 @@ static struct socket xs_create_sock(struct rpc_xprt xprt,
		goto out;
		}

		if (protocol == IPPROTO_TCP) {
		sock->sk->sk_net_refcnt = 1;
		get_net(xprt->xprt_net);
		#ifdef CONFIG_PROC_FS
		this_cpu_add(*xprt->xprt_net->core.sock_inuse, 1);
		#endif
		}

		return sock;
		out:
		return ERR_PTR(err);