From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:34504 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753794AbbLKUVf (ORCPT ); Fri, 11 Dec 2015 15:21:35 -0500 Subject: Patch "ipv6: sctp: implement sctp_v6_destroy_sock()" has been added to the 4.1-stable tree To: edumazet@google.com, daniel@iogearbox.net, davem@davemloft.net, dvyukov@google.com, gregkh@linuxfoundation.org Cc: , From: Date: Fri, 11 Dec 2015 08:48:42 -0800 Message-ID: <1449852522240158@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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.1-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.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Fri Dec 11 11:39:13 EST 2015 From: Eric Dumazet Date: Tue, 1 Dec 2015 07:20:07 -0800 Subject: ipv6: sctp: implement sctp_v6_destroy_sock() From: Eric Dumazet [ 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 Signed-off-by: Eric Dumazet Acked-by: Daniel Borkmann Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sctp/socket.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -7387,6 +7387,13 @@ struct proto sctp_prot = { #if IS_ENABLED(CONFIG_IPV6) +#include +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, Patches currently in stable-queue which might be from edumazet@google.com are queue-4.1/ipv6-add-complete-rcu-protection-around-np-opt.patch queue-4.1/packet-infer-protocol-from-ethernet-header-if-unset.patch queue-4.1/ipv6-sctp-implement-sctp_v6_destroy_sock.patch queue-4.1/tcp-disable-fast-open-on-timeouts-after-handshake.patch queue-4.1/net-scm-fix-pax-detected-msg_controllen-overflow-in-scm_detach_fds.patch queue-4.1/tcp-md5-fix-lockdep-annotation.patch queue-4.1/net_sched-fix-qdisc_tree_decrease_qlen-races.patch queue-4.1/tcp-initialize-tp-copied_seq-in-case-of-cross-syn-connection.patch queue-4.1/tcp-fix-potential-huge-kmalloc-calls-in-tcp_repair.patch queue-4.1/packet-do-skb_probe_transport_header-when-we-actually-have-data.patch