3.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Greg Kroah-Hartman <gre...@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 <mkube...@suse.cz>
Cc: Zijie Pan <zijie....@6wind.com>
Cc: Nicolas Dichtel <nicolas.dich...@6wind.com>
Cc: Vlad Yasevich <vyasev...@gmail.com>
Acked-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gre...@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:


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to