From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 21 Nov 2012 17:31:09 +0000 (-0800)
Subject: delete queue-3.6/sctp-fix-proc-net-sctp-memory-leak.patch
X-Git-Tag: v3.0.53~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9eea6f3e6e7d1d56553e206d10d13bacb01dac6d;p=thirdparty%2Fkernel%2Fstable-queue.git

delete queue-3.6/sctp-fix-proc-net-sctp-memory-leak.patch
---

diff --git a/queue-3.6/sctp-fix-proc-net-sctp-memory-leak.patch b/queue-3.6/sctp-fix-proc-net-sctp-memory-leak.patch
deleted file mode 100644
index 95a56bc9d4f..00000000000
--- a/queue-3.6/sctp-fix-proc-net-sctp-memory-leak.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 92732269096b1737ebb14b5cd98c1721fd5cbc15 Mon Sep 17 00:00:00 2001
-From: Tommi Rantala <tt.rantala@gmail.com>
-Date: Thu, 15 Nov 2012 03:49:05 +0000
-Subject: sctp: fix /proc/net/sctp/ memory leak
-
-
-From: Tommi Rantala <tt.rantala@gmail.com>
-
-[ Upstream commit 0da9a0c2638c8476b4a5021841912f249e3187dc ]
-
-Commit 13d782f ("sctp: Make the proc files per network namespace.")
-changed the /proc/net/sctp/ struct file_operations opener functions to
-use single_open_net() and seq_open_net().
-
-Avoid leaking memory by using single_release_net() and seq_release_net()
-as the release functions.
-
-Discovered with Trinity (the syscall fuzzer).
-
-Signed-off-by: Tommi Rantala <tt.rantala@gmail.com>
-Acked-by: Neil Horman <nhorman@tuxdriver.com>
-Cc: "Eric W. Biederman" <ebiederm@xmission.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/sctp/proc.c |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/net/sctp/proc.c
-+++ b/net/sctp/proc.c
-@@ -101,7 +101,7 @@ static const struct file_operations sctp
- 	.open	 = sctp_snmp_seq_open,
- 	.read	 = seq_read,
- 	.llseek	 = seq_lseek,
--	.release = single_release,
-+	.release = single_release_net,
- };
- 
- /* Set up the proc fs entry for 'snmp' object. */
-@@ -245,7 +245,7 @@ static const struct file_operations sctp
- 	.open	 = sctp_eps_seq_open,
- 	.read	 = seq_read,
- 	.llseek	 = seq_lseek,
--	.release = seq_release,
-+	.release = seq_release_net,
- };
- 
- /* Set up the proc fs entry for 'eps' object. */
-@@ -361,7 +361,7 @@ static const struct file_operations sctp
- 	.open	 = sctp_assocs_seq_open,
- 	.read	 = seq_read,
- 	.llseek	 = seq_lseek,
--	.release = seq_release,
-+	.release = seq_release_net,
- };
- 
- /* Set up the proc fs entry for 'assocs' object. */
-@@ -503,7 +503,7 @@ static const struct file_operations sctp
- 	.open = sctp_remaddr_seq_open,
- 	.read = seq_read,
- 	.llseek = seq_lseek,
--	.release = seq_release,
-+	.release = seq_release_net,
- };
- 
- int __init sctp_remaddr_proc_init(void)
diff --git a/queue-3.6/series b/queue-3.6/series
index 47d7fc466bb..445ea252085 100644
--- a/queue-3.6/series
+++ b/queue-3.6/series
@@ -56,7 +56,6 @@ ipv4-ip_vti.c-vti-fix-post-decryption-forwarding.patch
 ipv6-setsockopt-ipipproto_ipv6-ipv6_minhopcount-forgot-to-set-return-value.patch
 net-correct-check-in-dev_addr_del.patch
 net-rps-fix-brokeness-causing-ooo-packets.patch
-sctp-fix-proc-net-sctp-memory-leak.patch
 tcp-fix-retransmission-in-repair-mode.patch
 tcp-handle-tcp_net_metrics_init-order-5-memory-allocation-failures.patch
 tmpfs-change-final-i_blocks-bug-to-warning.patch