diff options
| author |   Tom Parkin <tparkin@katalix.com> | 2013-03-19 06:11:15 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-03-20 12:10:38 -0400 |
| commit | 936063175afd895913a5e9db77e1a0ef43ea44ea (patch) | |
| tree | f98e60750ccd05beb835cd5cc652432bca22a6ad /net/l2tp/l2tp_ip6.c | |
| parent | l2tp: export l2tp_tunnel_closeall (diff) | |
| download | linux-dev-936063175afd895913a5e9db77e1a0ef43ea44ea.tar.xz linux-dev-936063175afd895913a5e9db77e1a0ef43ea44ea.zip | |
l2tp: close sessions in ip socket destroy callback
l2tp_core hooks UDP's .destroy handler to gain advance warning of a tunnel
socket being closed from userspace. We need to do the same thing for
IP-encapsulation sockets.
Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/l2tp_ip6.c')
| -rw-r--r-- | net/l2tp/l2tp_ip6.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c index 41f2f8126ebc..c74f5a91ff6a 100644 --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c @@ -241,10 +241,17 @@ static void l2tp_ip6_close(struct sock *sk, long timeout) static void l2tp_ip6_destroy_sock(struct sock *sk) { + struct l2tp_tunnel *tunnel = l2tp_sock_to_tunnel(sk); + lock_sock(sk); ip6_flush_pending_frames(sk); release_sock(sk); + if (tunnel) { + l2tp_tunnel_closeall(tunnel); + sock_put(sk); + } + inet6_destroy_sock(sk); } |