Commit 047a7e9c authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Ben Hutchings

l2tp: fix use-after-free during module unload

commit 2f86953e upstream.

Tunnel deletion is delayed by both a workqueue (l2tp_tunnel_delete -> wq
 -> l2tp_tunnel_del_work) and RCU (sk_destruct -> RCU ->
l2tp_tunnel_destruct).

By the time l2tp_tunnel_destruct() runs to destroy the tunnel and finish
destroying the socket, the private data reserved via the net_generic
mechanism has already been freed, but l2tp_tunnel_destruct() actually
uses this data.

Make sure tunnel deletion for the netns has completed before returning
from l2tp_exit_net() by first flushing the tunnel removal workqueue, and
then waiting for RCU callbacks to complete.

Fixes: 167eb17e ("l2tp: create tunnel sockets in the right namespace")
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent b9ebc787
...@@ -1892,6 +1892,9 @@ static __net_exit void l2tp_exit_net(struct net *net) ...@@ -1892,6 +1892,9 @@ static __net_exit void l2tp_exit_net(struct net *net)
(void)l2tp_tunnel_delete(tunnel); (void)l2tp_tunnel_delete(tunnel);
} }
rcu_read_unlock_bh(); rcu_read_unlock_bh();
flush_workqueue(l2tp_wq);
rcu_barrier();
} }
static struct pernet_operations l2tp_net_ops = { static struct pernet_operations l2tp_net_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment