From: Eric Dumazet <edumazet@google.com>
Date: Tue, 1 Dec 2015 15:20:07 +0000 (-0800)
Subject: ipv6: sctp: implement sctp_v6_destroy_sock()
X-Git-Tag: v4.1.12-92~201^2~30
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3ec0240c224eb1f0dd4d216b358a208befcea33d;p=users%2Fjedix%2Flinux-maple.git

ipv6: sctp: implement sctp_v6_destroy_sock()

Orabug: 22623861

[ 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>
(cherry picked from commit cbff65fb298f5b9d147eb39fd4fc540d57748f69)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 5f6c4e61325b6..66d7960750509 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -7387,6 +7387,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,
@@ -7396,7 +7403,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,