diff options
| author | Guillaume Nault <g.nault@alphalink.fr> | 2017-11-09 00:29:52 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-11 11:05:17 +0100 |
| commit | 765924e362d12f87786060b98a49abd91e11ea96 (patch) | |
| tree | c83a3254af4dced8b31585362f310efd579a01c4 /net/l2tp | |
| parent | Merge branch 'FACK-loss-recovery-remove' (diff) | |
| download | linux-765924e362d12f87786060b98a49abd91e11ea96.tar.xz linux-765924e362d12f87786060b98a49abd91e11ea96.zip | |
l2tp: don't close sessions in l2tp_tunnel_destruct()
Sessions are already removed by the proto ->destroy() handlers, and
since commit f3c66d4e144a ("l2tp: prevent creation of sessions on terminated tunnels"),
we're guaranteed that no new session can be created afterwards.
Furthermore, l2tp_tunnel_closeall() can sleep when there are sessions
left to close. So we really shouldn't call it in a ->sk_destruct()
handler, as it can be used from atomic context.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 7c8d1eb757a5..350fcd39ebd8 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -1246,8 +1246,6 @@ static void l2tp_tunnel_destruct(struct sock *sk) list_del_rcu(&tunnel->list); spin_unlock_bh(&pn->l2tp_tunnel_list_lock); - l2tp_tunnel_closeall(tunnel); - tunnel->sock = NULL; l2tp_tunnel_dec_refcount(tunnel); |