summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2015-12-01 07:20:07 -0800
committerDavid S. Miller <davem@davemloft.net>2015-12-03 12:05:57 -0500
commit602dd62dfbda3e63a2d6a3cbde953ebe82bf5087 (patch)
tree3b7d4f344916bc68221506a4a141a68cc9b5aa1c /net
parent79aecc7216379788e0c6900ac50ea2d579190219 (diff)
downloadlinux-602dd62dfbda3e63a2d6a3cbde953ebe82bf5087.tar.gz
linux-602dd62dfbda3e63a2d6a3cbde953ebe82bf5087.tar.bz2
linux-602dd62dfbda3e63a2d6a3cbde953ebe82bf5087.zip
ipv6: sctp: implement sctp_v6_destroy_sock()
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>
Diffstat (limited to 'net')
-rw-r--r--net/sctp/socket.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index f6161e356734..03c8256063ec 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -7379,6 +7379,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,
@@ -7388,7 +7395,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,