android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy().

Browse Source 
commit b5fc29233d28be7a3322848ebe73ac327559cdb9 upstream.

After commit d38afeec26 ("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>
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kuniyuki Iwashima 2022-10-19 15:35:59 -07:00 committed by Greg Kroah-Hartman
parent 588d682251
commit a8cf114105
6 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv6/ping.c
View File

@ -23,11 +23,6 @@
#include <linux/bpf-cgroup.h> #include <linux/bpf-cgroup.h>
#include <net/ping.h> #include <net/ping.h>
static void ping_v6_destroy(struct sock *sk)
{
inet6_destroy_sock(sk);
}
/* Compatibility glue so we can support IPv6 when it's compiled as a module */ /* Compatibility glue so we can support IPv6 when it's compiled as a module */
static int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, static int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len,
int *addr_len) int *addr_len)
@ -205,7 +200,6 @@ struct proto pingv6_prot = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.init = ping_init_sock, .init = ping_init_sock,
.close = ping_close, .close = ping_close,
.destroy = ping_v6_destroy,
.pre_connect = ping_v6_pre_connect, .pre_connect = ping_v6_pre_connect,
.connect = ip6_datagram_connect_v6_only, .connect = ip6_datagram_connect_v6_only,
.disconnect = __udp_disconnect, .disconnect = __udp_disconnect,

2
net/ipv6/raw.c
View File

@ -1175,8 +1175,6 @@ static void raw6_destroy(struct sock *sk)
lock_sock(sk); lock_sock(sk);
ip6_flush_pending_frames(sk); ip6_flush_pending_frames(sk);
release_sock(sk); release_sock(sk);
inet6_destroy_sock(sk);
} }
static int rawv6_init_sk(struct sock *sk) static int rawv6_init_sk(struct sock *sk)

8
net/ipv6/tcp_ipv6.c
View File

@ -1951,12 +1951,6 @@ static int tcp_v6_init_sock(struct sock *sk)
return 0; return 0;
} }
static void tcp_v6_destroy_sock(struct sock *sk)
{
tcp_v4_destroy_sock(sk);
inet6_destroy_sock(sk);
}
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
/* Proc filesystem TCPv6 sock list dumping. */ /* Proc filesystem TCPv6 sock list dumping. */
static void get_openreq6(struct seq_file *seq, static void get_openreq6(struct seq_file *seq,
@ -2149,7 +2143,7 @@ struct proto tcpv6_prot = {
.accept = inet_csk_accept, .accept = inet_csk_accept,
.ioctl = tcp_ioctl, .ioctl = tcp_ioctl,
.init = tcp_v6_init_sock, .init = tcp_v6_init_sock,
.destroy = tcp_v6_destroy_sock, .destroy = tcp_v4_destroy_sock,
.shutdown = tcp_shutdown, .shutdown = tcp_shutdown,
.setsockopt = tcp_setsockopt, .setsockopt = tcp_setsockopt,
.getsockopt = tcp_getsockopt, .getsockopt = tcp_getsockopt,

2
net/ipv6/udp.c
View File

@ -1668,8 +1668,6 @@ void udpv6_destroy_sock(struct sock *sk)
udp_encap_disable(); udp_encap_disable();
} }
} }
inet6_destroy_sock(sk);
} }
/* /*

2
net/l2tp/l2tp_ip6.c
View File

@ -257,8 +257,6 @@ static void l2tp_ip6_destroy_sock(struct sock *sk)
if (tunnel) if (tunnel)
l2tp_tunnel_delete(tunnel); l2tp_tunnel_delete(tunnel);
inet6_destroy_sock(sk);
} }
static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)

7
net/mptcp/protocol.c
View File

@ -3939,12 +3939,6 @@ static const struct proto_ops mptcp_v6_stream_ops = {
static struct proto mptcp_v6_prot; static struct proto mptcp_v6_prot;
static void mptcp_v6_destroy(struct sock *sk)
{
mptcp_destroy(sk);
inet6_destroy_sock(sk);
}
static struct inet_protosw mptcp_v6_protosw = { static struct inet_protosw mptcp_v6_protosw = {
.type = SOCK_STREAM, .type = SOCK_STREAM,
.protocol = IPPROTO_MPTCP, .protocol = IPPROTO_MPTCP,
@ -3960,7 +3954,6 @@ int __init mptcp_proto_v6_init(void)
mptcp_v6_prot = mptcp_prot; mptcp_v6_prot = mptcp_prot;
strcpy(mptcp_v6_prot.name, "MPTCPv6"); strcpy(mptcp_v6_prot.name, "MPTCPv6");
mptcp_v6_prot.slab = NULL; mptcp_v6_prot.slab = NULL;
mptcp_v6_prot.destroy = mptcp_v6_destroy;
mptcp_v6_prot.obj_size = sizeof(struct mptcp6_sock); mptcp_v6_prot.obj_size = sizeof(struct mptcp6_sock);
err = proto_register(&mptcp_v6_prot, 1); err = proto_register(&mptcp_v6_prot, 1);