]> git.baikalelectronics.ru Git - kernel.git/commit
net: fix a concurrency bug in l2tp_tunnel_register()
authorGong, Sishuai <sishuai@purdue.edu>
Tue, 27 Apr 2021 15:04:24 +0000 (15:04 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2023 06:52:37 +0000 (07:52 +0100)
commited471b84ec0fd49b040cdb00345543f6d4644167
treebcb247e8e995afc60d5d532b39c6715573d21862
parentf9eddf07f3849629925e4bc2fd137eec4512892c
net: fix a concurrency bug in l2tp_tunnel_register()

[ Upstream commit b436200f41afa3838c16f34f65e8968cb0279e1c ]

l2tp_tunnel_register() registers a tunnel without fully
initializing its attribute. This can allow another kernel thread
running l2tp_xmit_core() to access the uninitialized data and
then cause a kernel NULL pointer dereference error, as shown below.

Thread 1    Thread 2
//l2tp_tunnel_register()
list_add_rcu(&tunnel->list, &pn->l2tp_tunnel_list);
           //pppol2tp_connect()
           tunnel = l2tp_tunnel_get(sock_net(sk), info.tunnel_id);
           // Fetch the new tunnel
           ...
           //l2tp_xmit_core()
           struct sock *sk = tunnel->sock;
           ...
           bh_lock_sock(sk);
           //Null pointer error happens
tunnel->sock = sk;

Fix this bug by initializing tunnel->sock before adding the
tunnel into l2tp_tunnel_list.

Reviewed-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: Sishuai Gong <sishuai@purdue.edu>
Reported-by: Sishuai Gong <sishuai@purdue.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/l2tp/l2tp_core.c