3.4-stable patches

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

diff --git a/queue-3.4/revert-sctp-fix-call-to-sctp_cmd_process_sack-in.patch b/queue-3.4/revert-sctp-fix-call-to-sctp_cmd_process_sack-in.patch
new file mode 100644 (file)
index 0000000..d49ac83
--- /dev/null
+++ b/queue-3.4/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 c2f5b7507ac5d808f29287d77ee6148358d7fbfe 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
+@@ -1610,9 +1610,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.4/series b/queue-3.4/series
new file mode 100644 (file)
index 0000000..13558d1
--- /dev/null
+++ b/queue-3.4/series
@@ -0,0 +1 @@
+revert-sctp-fix-call-to-sctp_cmd_process_sack-in.patch