diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-12-01 07:20:07 -0800 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-01-05 16:11:15 +0100 |
| commit | d7ca7e9c04e8f46c161b0edb9219ed364a233338 (patch) | |
| tree | cec134d96eb9331f7b7ccd8f3151be9b8c83ff7a | |
| parent | 18e7027fea6a8487e2dd627624de1ade82e793a5 (diff) | |
| download | lwn-d7ca7e9c04e8f46c161b0edb9219ed364a233338.tar.gz lwn-d7ca7e9c04e8f46c161b0edb9219ed364a233338.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: Jiri Slaby <jslaby@suse.cz>
| -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 09b147e0fe57..cf9ea9dacfe5 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -7130,6 +7130,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, @@ -7139,7 +7146,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, |