dccp: Call inet6_destroy_sock() via sk->sk_destruct().

commit 1651951ebea54970e0bda60c638fc2eee7a6218f upstream.

After commit 48385351c598 ("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.

DCCP sets its own sk->sk_destruct() in the dccp_init_sock(), and
DCCPv6 socket shares it by calling the same init function via
dccp_v6_init_sock().

To call inet6_sock_destruct() from DCCPv6 sk->sk_destruct(), we
export it and set dccp_v6_sk_destruct() in the init function.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
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>

diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index cb818617699c3f79360f7903fff7b74872ba011c..8c9a63ef7585a52474d53a2000dcde65e7faf7b4 100644 (file)
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -288,6 +288,7 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
 int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
                         const struct dccp_hdr *dh, const unsigned int len);
 
+void dccp_destruct_common(struct sock *sk);
 int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized);
 void dccp_destroy_sock(struct sock *sk);
 

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index c2844fb442c4fdeb124ce64a15262c6d19dd0549..77cb4315b96692cb47a8c4f2f328fddba6361ad2 100644 (file)
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -1000,6 +1000,12 @@ static const struct inet_connection_sock_af_ops dccp_ipv6_mapped = {
 #endif
 };
 
+static void dccp_v6_sk_destruct(struct sock *sk)
+{
+       dccp_destruct_common(sk);
+       inet6_sock_destruct(sk);
+}
+
 /* NOTE: A lot of things set to zero explicitly by call to
  *       sk_alloc() so need not be done here.
  */
@@ -1012,17 +1018,12 @@ static int dccp_v6_init_sock(struct sock *sk)
                if (unlikely(!dccp_v6_ctl_sock_initialized))
                        dccp_v6_ctl_sock_initialized = 1;
                inet_csk(sk)->icsk_af_ops = &dccp_ipv6_af_ops;
+               sk->sk_destruct = dccp_v6_sk_destruct;
        }
 
        return err;
 }
 
-static void dccp_v6_destroy_sock(struct sock *sk)
-{
-       dccp_destroy_sock(sk);
-       inet6_destroy_sock(sk);
-}
-
 static struct timewait_sock_ops dccp6_timewait_sock_ops = {
        .twsk_obj_size  = sizeof(struct dccp6_timewait_sock),
 };
@@ -1045,7 +1046,7 @@ static struct proto dccp_v6_prot = {
        .accept            = inet_csk_accept,
        .get_port          = inet_csk_get_port,
        .shutdown          = dccp_shutdown,
-       .destroy           = dccp_v6_destroy_sock,
+       .destroy           = dccp_destroy_sock,
        .orphan_count      = &dccp_orphan_count,
        .max_header        = MAX_DCCP_HEADER,
        .obj_size          = sizeof(struct dccp6_sock),

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 951cbdf05ffe9359fe640172e1d3badeea170df8..3a3a2e1800be7e3af827b40d9ac0c7a7442c9c5b 100644 (file)
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -171,12 +171,18 @@ const char *dccp_packet_name(const int type)
 
 EXPORT_SYMBOL_GPL(dccp_packet_name);
 
-static void dccp_sk_destruct(struct sock *sk)
+void dccp_destruct_common(struct sock *sk)
 {
        struct dccp_sock *dp = dccp_sk(sk);
 
        ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk);
        dp->dccps_hc_tx_ccid = NULL;
+}
+EXPORT_SYMBOL_GPL(dccp_destruct_common);
+
+static void dccp_sk_destruct(struct sock *sk)
+{
+       dccp_destruct_common(sk);
        inet_sock_destruct(sk);
 }
 

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index d99fe9f8451388e3dcaef952a7c0333efe2a58b8..a5fc9444c7286c72953e04aad6ed8656307541e5 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -109,6 +109,7 @@ void inet6_sock_destruct(struct sock *sk)
        inet6_cleanup_sock(sk);
        inet_sock_destruct(sk);
 }
+EXPORT_SYMBOL_GPL(inet6_sock_destruct);
 
 static int inet6_create(struct net *net, struct socket *sock, int protocol,
                        int kern)