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)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Apr 2021 21:23:13 +0000 (14:23 -0700)
commit69e16d01d1de4f1249869de342915f608feb55d5
tree07ad6e46ad91358a2043adcb7e522ad71408bcd7
parent6fd6c483e7abf0f67d02d9a49b217efcd01314f4
net: fix a concurrency bug in l2tp_tunnel_register()

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>
net/l2tp/l2tp_core.c