Skip to contentSkip to conversation

Patch "ipv6: sctp: implement sctp_v6_destroy_sock()" has been added to the 4.3-stable tree

PATCH [email protected] 1 participant 1 message Dec 11, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ipv6: sctp: implement sctp_v6_destroy_sock()

to the 4.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ipv6-sctp-implement-sctp_v6_destroy_sock.patch
and it can be found in the queue-4.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Fri Dec 11 11:38:06 EST 2015

From: Eric Dumazet <[email protected]>
Date: Tue, 1 Dec 2015 07:20:07 -0800
Subject: ipv6: sctp: implement sctp_v6_destroy_sock()

From: Eric Dumazet <[email protected]>

[ 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.

---
 net/sctp/socket.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
net/sctp/socket.c +8 -1
@@ -7375,6 +7375,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,
@@ -7384,7 +7391,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,

Patches currently in stable-queue which might be from [email protected] are

queue-4.3/ipv6-add-complete-rcu-protection-around-np-opt.patch queue-4.3/packet-infer-protocol-from-ethernet-header-if-unset.patch queue-4.3/af-unix-passcred-support-for-sendpage.patch queue-4.3/ipv6-sctp-implement-sctp_v6_destroy_sock.patch queue-4.3/af_unix-don-t-append-consumed-skbs-to-sk_receive_queue.patch queue-4.3/tcp-disable-fast-open-on-timeouts-after-handshake.patch queue-4.3/net-scm-fix-pax-detected-msg_controllen-overflow-in-scm_detach_fds.patch queue-4.3/tcp-md5-fix-lockdep-annotation.patch queue-4.3/af-unix-fix-use-after-free-with-concurrent-readers-while-splicing.patch queue-4.3/net_sched-fix-qdisc_tree_decrease_qlen-races.patch queue-4.3/tcp-initialize-tp-copied_seq-in-case-of-cross-syn-connection.patch queue-4.3/tcp-fix-potential-huge-kmalloc-calls-in-tcp_repair.patch queue-4.3/packet-do-skb_probe_transport_header-when-we-actually-have-data.patch queue-4.3/af_unix-take-receive-queue-lock-while-appending-new-skb.patch queue-4.3/r8169-fix-kasan-reported-skb-use-after-free.patch