From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 27 Sep 2013 15:39:02 +0000 (-0700)
Subject: 3.0-stable patches
X-Git-Tag: v3.0.98~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=188c766ac86b0257eed0c2fdc482713eef02c8cb;p=thirdparty%2Fkernel%2Fstable-queue.git

3.0-stable patches

added patches:
	revert-sctp-fix-call-to-sctp_cmd_process_sack-in.patch
---

diff --git a/queue-3.0/revert-sctp-fix-call-to-sctp_cmd_process_sack-in.patch b/queue-3.0/revert-sctp-fix-call-to-sctp_cmd_process_sack-in.patch
new file mode 100644
index 00000000000..825f32d12df
--- /dev/null
+++ b/queue-3.0/revert-sctp-fix-call-to-sctp_cmd_process_sack-in.patch
@@ -0,0 +1,46 @@
+From ce1aacd011fd5d99a24469270832f7c9a0dbad5e Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 27 Sep 2013 08:34:49 -0700
+Subject: Revert "sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit b23270416da409bd4e637a5acbe31a1126235fb6 which is
+commit f6e80abeab928b7c47cc1fbf53df13b4398a2bec.
+
+Michal writes:
+	Mainline commit f6e80abe was introduced in v3.7-rc2 as a
+	follow-up fix to commit
+
+	  edfee033  sctp: check src addr when processing SACK to update transport state
+
+	(from v3.7-rc1) which changed the interpretation of third
+	argument to sctp_cmd_process_sack() and sctp_outq_sack(). But as
+	commit edfee033 has never been backported to stable branches,
+	backport of commit f6e80abe actually breaks the code rather than
+	fixing it.
+
+Reported-by: Michal Kubecek <mkubecek@suse.cz>
+Cc: Zijie Pan <zijie.pan@6wind.com>
+Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
+Cc: Vlad Yasevich <vyasevich@gmail.com>
+Acked-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/sctp/sm_sideeffect.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/net/sctp/sm_sideeffect.c
++++ b/net/sctp/sm_sideeffect.c
+@@ -1604,9 +1604,8 @@ static int sctp_cmd_interpreter(sctp_eve
+ 					asoc->outqueue.outstanding_bytes;
+ 			sackh.num_gap_ack_blocks = 0;
+ 			sackh.num_dup_tsns = 0;
+-			chunk->subh.sack_hdr = &sackh;
+ 			sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_SACK,
+-					SCTP_CHUNK(chunk));
++					SCTP_SACKH(&sackh));
+ 			break;
+ 
+ 		case SCTP_CMD_DISCARD_PACKET:
diff --git a/queue-3.0/series b/queue-3.0/series
new file mode 100644
index 00000000000..13558d1ee14
--- /dev/null
+++ b/queue-3.0/series
@@ -0,0 +1 @@
+revert-sctp-fix-call-to-sctp_cmd_process_sack-in.patch