3.5.7.23 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Luis Henriques <luis.henriques@xxxxxxxxxxxxx> 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@xxxxxxxxxx> Cc: Michal Kubecek <mkubecek@xxxxxxx> Signed-off-by: Luis Henriques <luis.henriques@xxxxxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html