diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-10-19 15:35:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-10-24 09:40:38 +0100 |
| commit | b5fc29233d28be7a3322848ebe73ac327559cdb9 (patch) | |
| tree | b071a492acb533a56f36f116106af45340663ee9 /net/l2tp | |
| parent | 225480f040b68ae313dcc5e012cc2d34e5816c4d (diff) | |
| download | lwn-b5fc29233d28be7a3322848ebe73ac327559cdb9.tar.gz lwn-b5fc29233d28be7a3322848ebe73ac327559cdb9.zip | |
inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy().
After commit d38afeec26ed ("tcp/udp: Call inet6_destroy_sock()
in IPv6 sk->sk_destruct()."), we call inet6_destroy_sock() in
sk->sk_destruct() by setting inet6_sock_destruct() to it to make
sure we do not leak inet6-specific resources.
Now we can remove unnecessary inet6_destroy_sock() calls in
sk->sk_prot->destroy().
DCCP and SCTP have their own sk->sk_destruct() function, so we
change them separately in the following patches.
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_ip6.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c index 9dbd801ddb98..2478aa60145f 100644 --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c @@ -257,8 +257,6 @@ static void l2tp_ip6_destroy_sock(struct sock *sk) if (tunnel) l2tp_tunnel_delete(tunnel); - - inet6_destroy_sock(sk); } static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) |