diff options
author | Eric Dumazet <edumazet@google.com> | 2015-12-01 07:20:07 -0800 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2015-12-30 02:26:02 +0000 |
commit | dfc263fdf39a48ac2190c166af9377acba086531 (patch) | |
tree | 3b5f6ddead120cc681b975adfecab5980e2e79c8 /net/sctp/socket.c | |
parent | 5bf369b4470d3618af67b572a82d76b92ce1abd1 (diff) |
ipv6: sctp: implement sctp_v6_destroy_sock()
[ Upstream commit 602dd62dfbda3e63a2d6a3cbde953ebe82bf5087 ]
Dmitry Vyukov reported a memory leak using IPV6 SCTP sockets.
We need to call inet6_destroy_sock() to properly release
inet6 specific fields.
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/sctp/socket.c')
-rw-r--r-- | net/sctp/socket.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 24e88afd35d7..27eb73d44e59 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -6910,6 +6910,13 @@ struct proto sctp_prot = { #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) +#include <net/transp_v6.h> +static void sctp_v6_destroy_sock(struct sock *sk) +{ + sctp_destroy_sock(sk); + inet6_destroy_sock(sk); +} + struct proto sctpv6_prot = { .name = "SCTPv6", .owner = THIS_MODULE, @@ -6919,7 +6926,7 @@ struct proto sctpv6_prot = { .accept = sctp_accept, .ioctl = sctp_ioctl, .init = sctp_init_sock, - .destroy = sctp_destroy_sock, + .destroy = sctp_v6_destroy_sock, .shutdown = sctp_shutdown, .setsockopt = sctp_setsockopt, .getsockopt = sctp_getsockopt, |