[ 3.5.y.z extended stable ] Patch "Revert "sctp: fix call to SCTP_CMD_PROCESS_SACK in" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    Revert "sctp: fix call to SCTP_CMD_PROCESS_SACK in

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From d05969102e074de87dfc0ff5af2ef7872074baad Mon Sep 17 00:00:00 2001
From: Luis Henriques <luis.henriques at canonical.com>
Date: Mon, 30 Sep 2013 18:44:05 +0100
Subject: [PATCH] Revert "sctp: fix call to SCTP_CMD_PROCESS_SACK in
 sctp_cmd_interpreter()"

This reverts commit 01ee5a524eaa7928e8ee1ae4a0051084cfcaf904 which is
commit f6e80abeab928b7c47cc1fbf53df13b4398a2bec upstream.

Michal Kubecek reported:

Please revert backports of mainline commit

   f6e80abe  sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()

 in stable branches before 3.7, in particular

   stable-3.0.y  b23270416da409bd4e637a5acbe31a1126235fb6  (v3.0.52)
   stable-3.4.y  c2f5b7507ac5d808f29287d77ee6148358d7fbfe  (v3.4.19)

 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.

Cc: David Miller <davem at redhat.com>
Cc: Michal Kubecek <mkubecek at suse.cz>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 net/sctp/sm_sideeffect.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index c461b1c..8716da1 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -1609,9 +1609,8 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
 					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:
--
1.8.3.2