Linux 3.6.7

[thirdparty/kernel/stable-queue.git] / releases / 3.6.7 / sctp-fix-call-to-sctp_cmd_process_sack-in-sctp_cmd_interpreter.patch

diff --git a/releases/3.6.7/sctp-fix-call-to-sctp_cmd_process_sack-in-sctp_cmd_interpreter.patch b/releases/3.6.7/sctp-fix-call-to-sctp_cmd_process_sack-in-sctp_cmd_interpreter.patch
new file mode 100644 (file)
index 0000000..8f4d177
--- /dev/null
+++ b/releases/3.6.7/sctp-fix-call-to-sctp_cmd_process_sack-in-sctp_cmd_interpreter.patch
@@ -0,0 +1,35 @@
+From 7331a3a6f59ebd5a9a93f2d0f8b4f8f97620116a Mon Sep 17 00:00:00 2001
+From: Zijie Pan <zijie.pan@6wind.com>
+Date: Mon, 15 Oct 2012 03:56:39 +0000
+Subject: sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()
+
+
+From: Zijie Pan <zijie.pan@6wind.com>
+
+[ Upstream commit f6e80abeab928b7c47cc1fbf53df13b4398a2bec ]
+
+Bug introduced by commit edfee0339e681a784ebacec7e8c2dc97dc6d2839
+(sctp: check src addr when processing SACK to update transport state)
+
+Signed-off-by: Zijie Pan <zijie.pan@6wind.com>
+Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
+Acked-by: Vlad Yasevich <vyasevich@gmail.com>
+Signed-off-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, 2 insertions(+), 1 deletion(-)
+
+--- a/net/sctp/sm_sideeffect.c
++++ b/net/sctp/sm_sideeffect.c
+@@ -1634,8 +1634,9 @@ 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_SACKH(&sackh));
++                                      SCTP_CHUNK(chunk));
+                       break;
+ 
+               case SCTP_CMD_DISCARD_PACKET: