All of lore.kernel.org
 help / color / mirror / Atom feed
From: <gregkh@linuxfoundation.org>
To: edumazet@google.com, daniel@iogearbox.net, davem@davemloft.net,
	dvyukov@google.com, gregkh@linuxfoundation.org
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "ipv6: sctp: implement sctp_v6_destroy_sock()" has been added to the 4.3-stable tree
Date: Fri, 11 Dec 2015 08:49:34 -0800	[thread overview]
Message-ID: <144985257487223@kroah.com> (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 <stable@vger.kernel.org> know about it.


>From foo@baz Fri Dec 11 11:38:06 EST 2015
From: Eric Dumazet <edumazet@google.com>
Date: Tue, 1 Dec 2015 07:20:07 -0800
Subject: ipv6: sctp: implement sctp_v6_destroy_sock()

From: Eric Dumazet <edumazet@google.com>

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

--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -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 edumazet@google.com 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

                 reply	other threads:[~2015-12-11 20:22 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=144985257487223@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=dvyukov@google.com \
    --cc=edumazet@google.com \
    --cc=stable-commits@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.