Skip to content

Commit 04d63e6

Browse files
davem330davem330
committed
Merge branch 'inet6_destroy_sock-calls-remove'
Kuniyuki Iwashima says: ==================== inet6: Remove inet6_destroy_sock() calls. This is a follow-up series for commit d38afee ("tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct()."). This series cleans up unnecessary inet6_destory_sock() calls in sk->sk_prot->destroy() and call it from sk->sk_destruct() to make sure we do not leak memory related to IPv6 specific-resources. Changes: v2: * patch 1 * Fix build failure for CONFIG_MPTCP_IPV6=y v1: https://lore.kernel.org/netdev/[email protected]/ ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 225480f + b45a337 commit 04d63e6

File tree

13 files changed

+42
-55
lines changed

13 files changed

+42
-55
lines changed

‎include/net/transp_v6.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp, __u16 srcp,
5858

5959
#define LOOPBACK4_IPV6 cpu_to_be32(0x7f000006)
6060

61-
void inet6_destroy_sock(struct sock *sk);
62-
6361
#define IPV6_SEQ_DGRAM_HEADER \
6462
" sl " \
6563
"local_address " \

‎net/dccp/dccp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
278278
int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
279279
const struct dccp_hdr *dh, const unsigned int len);
280280

281+
void dccp_destruct_common(struct sock *sk);
281282
int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized);
282283
void dccp_destroy_sock(struct sock *sk);
283284

‎net/dccp/ipv6.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,6 +1021,12 @@ static const struct inet_connection_sock_af_ops dccp_ipv6_mapped = {
10211021
.sockaddr_len = sizeof(struct sockaddr_in6),
10221022
};
10231023

1024+
static void dccp_v6_sk_destruct(struct sock *sk)
1025+
{
1026+
dccp_destruct_common(sk);
1027+
inet6_sock_destruct(sk);
1028+
}
1029+
10241030
/* NOTE: A lot of things set to zero explicitly by call to
10251031
* sk_alloc() so need not be done here.
10261032
*/
@@ -1033,17 +1039,12 @@ static int dccp_v6_init_sock(struct sock *sk)
10331039
if (unlikely(!dccp_v6_ctl_sock_initialized))
10341040
dccp_v6_ctl_sock_initialized = 1;
10351041
inet_csk(sk)->icsk_af_ops = &dccp_ipv6_af_ops;
1042+
sk->sk_destruct = dccp_v6_sk_destruct;
10361043
}
10371044

10381045
return err;
10391046
}
10401047

1041-
static void dccp_v6_destroy_sock(struct sock *sk)
1042-
{
1043-
dccp_destroy_sock(sk);
1044-
inet6_destroy_sock(sk);
1045-
}
1046-
10471048
static struct timewait_sock_ops dccp6_timewait_sock_ops = {
10481049
.twsk_obj_size = sizeof(struct dccp6_timewait_sock),
10491050
};
@@ -1066,7 +1067,7 @@ static struct proto dccp_v6_prot = {
10661067
.accept = inet_csk_accept,
10671068
.get_port = inet_csk_get_port,
10681069
.shutdown = dccp_shutdown,
1069-
.destroy = dccp_v6_destroy_sock,
1070+
.destroy = dccp_destroy_sock,
10701071
.orphan_count = &dccp_orphan_count,
10711072
.max_header = MAX_DCCP_HEADER,
10721073
.obj_size = sizeof(struct dccp6_sock),

‎net/dccp/proto.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,18 @@ const char *dccp_packet_name(const int type)
171171

172172
EXPORT_SYMBOL_GPL(dccp_packet_name);
173173

174-
static void dccp_sk_destruct(struct sock *sk)
174+
void dccp_destruct_common(struct sock *sk)
175175
{
176176
struct dccp_sock *dp = dccp_sk(sk);
177177

178178
ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk);
179179
dp->dccps_hc_tx_ccid = NULL;
180+
}
181+
EXPORT_SYMBOL_GPL(dccp_destruct_common);
182+
183+
static void dccp_sk_destruct(struct sock *sk)
184+
{
185+
dccp_destruct_common(sk);
180186
inet_sock_destruct(sk);
181187
}
182188

‎net/ipv6/af_inet6.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ void inet6_sock_destruct(struct sock *sk)
114114
inet6_cleanup_sock(sk);
115115
inet_sock_destruct(sk);
116116
}
117+
EXPORT_SYMBOL_GPL(inet6_sock_destruct);
117118

118119
static int inet6_create(struct net *net, struct socket *sock, int protocol,
119120
int kern)
@@ -489,7 +490,7 @@ int inet6_release(struct socket *sock)
489490
}
490491
EXPORT_SYMBOL(inet6_release);
491492

492-
void inet6_destroy_sock(struct sock *sk)
493+
void inet6_cleanup_sock(struct sock *sk)
493494
{
494495
struct ipv6_pinfo *np = inet6_sk(sk);
495496
struct sk_buff *skb;
@@ -514,12 +515,6 @@ void inet6_destroy_sock(struct sock *sk)
514515
txopt_put(opt);
515516
}
516517
}
517-
EXPORT_SYMBOL_GPL(inet6_destroy_sock);
518-
519-
void inet6_cleanup_sock(struct sock *sk)
520-
{
521-
inet6_destroy_sock(sk);
522-
}
523518
EXPORT_SYMBOL_GPL(inet6_cleanup_sock);
524519

525520
/*

‎net/ipv6/ipv6_sockglue.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,10 +1005,8 @@ int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
10051005
return retv;
10061006

10071007
e_inval:
1008-
sockopt_release_sock(sk);
1009-
if (needs_rtnl)
1010-
rtnl_unlock();
1011-
return -EINVAL;
1008+
retv = -EINVAL;
1009+
goto unlock;
10121010
}
10131011

10141012
int ipv6_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval,

‎net/ipv6/ping.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@
2323
#include <linux/bpf-cgroup.h>
2424
#include <net/ping.h>
2525

26-
static void ping_v6_destroy(struct sock *sk)
27-
{
28-
inet6_destroy_sock(sk);
29-
}
30-
3126
/* Compatibility glue so we can support IPv6 when it's compiled as a module */
3227
static int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len,
3328
int *addr_len)
@@ -205,7 +200,6 @@ struct proto pingv6_prot = {
205200
.owner = THIS_MODULE,
206201
.init = ping_init_sock,
207202
.close = ping_close,
208-
.destroy = ping_v6_destroy,
209203
.pre_connect = ping_v6_pre_connect,
210204
.connect = ip6_datagram_connect_v6_only,
211205
.disconnect = __udp_disconnect,

‎net/ipv6/raw.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,8 +1173,6 @@ static void raw6_destroy(struct sock *sk)
11731173
lock_sock(sk);
11741174
ip6_flush_pending_frames(sk);
11751175
release_sock(sk);
1176-
1177-
inet6_destroy_sock(sk);
11781176
}
11791177

11801178
static int rawv6_init_sk(struct sock *sk)

‎net/ipv6/tcp_ipv6.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,12 +1966,6 @@ static int tcp_v6_init_sock(struct sock *sk)
19661966
return 0;
19671967
}
19681968

1969-
static void tcp_v6_destroy_sock(struct sock *sk)
1970-
{
1971-
tcp_v4_destroy_sock(sk);
1972-
inet6_destroy_sock(sk);
1973-
}
1974-
19751969
#ifdef CONFIG_PROC_FS
19761970
/* Proc filesystem TCPv6 sock list dumping. */
19771971
static void get_openreq6(struct seq_file *seq,
@@ -2164,7 +2158,7 @@ struct proto tcpv6_prot = {
21642158
.accept = inet_csk_accept,
21652159
.ioctl = tcp_ioctl,
21662160
.init = tcp_v6_init_sock,
2167-
.destroy = tcp_v6_destroy_sock,
2161+
.destroy = tcp_v4_destroy_sock,
21682162
.shutdown = tcp_shutdown,
21692163
.setsockopt = tcp_setsockopt,
21702164
.getsockopt = tcp_getsockopt,

‎net/ipv6/udp.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,8 +1661,6 @@ void udpv6_destroy_sock(struct sock *sk)
16611661
udp_encap_disable();
16621662
}
16631663
}
1664-
1665-
inet6_destroy_sock(sk);
16661664
}
16671665

16681666
/*

‎net/l2tp/l2tp_ip6.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,6 @@ static void l2tp_ip6_destroy_sock(struct sock *sk)
257257

258258
if (tunnel)
259259
l2tp_tunnel_delete(tunnel);
260-
261-
inet6_destroy_sock(sk);
262260
}
263261

264262
static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)

‎net/mptcp/protocol.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3898,12 +3898,6 @@ static const struct proto_ops mptcp_v6_stream_ops = {
38983898

38993899
static struct proto mptcp_v6_prot;
39003900

3901-
static void mptcp_v6_destroy(struct sock *sk)
3902-
{
3903-
mptcp_destroy(sk);
3904-
inet6_destroy_sock(sk);
3905-
}
3906-
39073901
static struct inet_protosw mptcp_v6_protosw = {
39083902
.type = SOCK_STREAM,
39093903
.protocol = IPPROTO_MPTCP,
@@ -3919,7 +3913,6 @@ int __init mptcp_proto_v6_init(void)
39193913
mptcp_v6_prot = mptcp_prot;
39203914
strcpy(mptcp_v6_prot.name, "MPTCPv6");
39213915
mptcp_v6_prot.slab = NULL;
3922-
mptcp_v6_prot.destroy = mptcp_v6_destroy;
39233916
mptcp_v6_prot.obj_size = sizeof(struct mptcp6_sock);
39243917

39253918
err = proto_register(&mptcp_v6_prot, 1);

‎net/sctp/socket.c

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5098,13 +5098,17 @@ static void sctp_destroy_sock(struct sock *sk)
50985098
}
50995099

51005100
/* Triggered when there are no references on the socket anymore */
5101-
static void sctp_destruct_sock(struct sock *sk)
5101+
static void sctp_destruct_common(struct sock *sk)
51025102
{
51035103
struct sctp_sock *sp = sctp_sk(sk);
51045104

51055105
/* Free up the HMAC transform. */
51065106
crypto_free_shash(sp->hmac);
5107+
}
51075108

5109+
static void sctp_destruct_sock(struct sock *sk)
5110+
{
5111+
sctp_destruct_common(sk);
51085112
inet_sock_destruct(sk);
51095113
}
51105114

@@ -9427,7 +9431,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk,
94279431
sctp_sk(newsk)->reuse = sp->reuse;
94289432

94299433
newsk->sk_shutdown = sk->sk_shutdown;
9430-
newsk->sk_destruct = sctp_destruct_sock;
9434+
newsk->sk_destruct = sk->sk_destruct;
94319435
newsk->sk_family = sk->sk_family;
94329436
newsk->sk_protocol = IPPROTO_SCTP;
94339437
newsk->sk_backlog_rcv = sk->sk_prot->backlog_rcv;
@@ -9662,11 +9666,20 @@ struct proto sctp_prot = {
96629666

96639667
#if IS_ENABLED(CONFIG_IPV6)
96649668

9665-
#include <net/transp_v6.h>
9666-
static void sctp_v6_destroy_sock(struct sock *sk)
9669+
static void sctp_v6_destruct_sock(struct sock *sk)
9670+
{
9671+
sctp_destruct_common(sk);
9672+
inet6_sock_destruct(sk);
9673+
}
9674+
9675+
static int sctp_v6_init_sock(struct sock *sk)
96679676
{
9668-
sctp_destroy_sock(sk);
9669-
inet6_destroy_sock(sk);
9677+
int ret = sctp_init_sock(sk);
9678+
9679+
if (!ret)
9680+
sk->sk_destruct = sctp_v6_destruct_sock;
9681+
9682+
return ret;
96709683
}
96719684

96729685
struct proto sctpv6_prot = {
@@ -9676,8 +9689,8 @@ struct proto sctpv6_prot = {
96769689
.disconnect = sctp_disconnect,
96779690
.accept = sctp_accept,
96789691
.ioctl = sctp_ioctl,
9679-
.init = sctp_init_sock,
9680-
.destroy = sctp_v6_destroy_sock,
9692+
.init = sctp_v6_init_sock,
9693+
.destroy = sctp_destroy_sock,
96819694
.shutdown = sctp_shutdown,
96829695
.setsockopt = sctp_setsockopt,
96839696
.getsockopt = sctp_getsockopt,

0 commit comments

Comments
 (0)