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 20:34:49 -0800 |
| commit | a8fa15f0be8c6d2c03afce5f09d5e96c0aec4eb8 (patch) | |
| tree | 5266febbff44f116cac58bb61137697c9410214b /net | |
| parent | f4ce575c5d5bcce5d4d03a24baa4308cf3409ab3 (diff) | |
| download | lwn-a8fa15f0be8c6d2c03afce5f09d5e96c0aec4eb8.tar.gz lwn-a8fa15f0be8c6d2c03afce5f09d5e96c0aec4eb8.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 f940fdc540f5..7b0646e9f324 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -7165,6 +7165,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, @@ -7174,7 +7181,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, |