diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-12-01 07:20:07 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-22 19:47:52 -0800 |
| commit | 622af8c8e93802e9ae2cdde93563c69a68feeccb (patch) | |
| tree | 361ae94b6ef3d6ba8622840592550fe0a3256400 /net | |
| parent | 7cd9f6022097acdeb1f14bc9a5d44c40629d11a9 (diff) | |
| download | linux-stable-622af8c8e93802e9ae2cdde93563c69a68feeccb.tar.gz linux-stable-622af8c8e93802e9ae2cdde93563c69a68feeccb.tar.bz2 linux-stable-622af8c8e93802e9ae2cdde93563c69a68feeccb.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -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 ec5766dc3946..01a33dfd4f17 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -7149,6 +7149,13 @@ struct proto sctp_prot = { #if IS_ENABLED(CONFIG_IPV6) +#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, @@ -7158,7 +7165,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, |