Commit 85d76b96 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Yongqiang Liu
Browse files

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

stable inclusion
from stable-v4.19.282
commit e1820a934398d35a5925bcf61316983c90857f7d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7BZ5U


CVE: NA

--------------------------------

commit b5fc2923 upstream.

After commit d38afeec ("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: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarZiyang Xuan <william.xuanziyang@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarYongqiang Liu <liuyongqiang13@huawei.com>
parent 7d023a7e

net/ipv6/ping.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -27,11 +27,6 @@ 
#include <linux/proc_fs.h>

#include <linux/proc_fs.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)
@@ -175,7 +170,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,

	.connect =	ip6_datagram_connect_v6_only,

	.connect =	ip6_datagram_connect_v6_only,

	.disconnect =	__udp_disconnect,

	.disconnect =	__udp_disconnect,

	.setsockopt =	ipv6_setsockopt,

	.setsockopt =	ipv6_setsockopt,

net/ipv6/raw.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1258,8 +1258,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)

net/ipv6/tcp_ipv6.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -1785,12 +1785,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,
@@ -1983,7 +1977,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,

net/ipv6/udp.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1503,8 +1503,6 @@ void udpv6_destroy_sock(struct sock *sk) 
		if (encap_destroy)

		if (encap_destroy)

			encap_destroy(sk);

			encap_destroy(sk);

	}

	}



	inet6_destroy_sock(sk);

}

}





/*

/*

net/l2tp/l2tp_ip6.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -272,8 +272,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)