From patchwork Fri Oct 11 10:40:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 282625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id AF1262C0096 for ; Fri, 11 Oct 2013 21:43:17 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VUaBc-0002nc-Um; Fri, 11 Oct 2013 10:43:12 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VUaBC-0002H8-1h for kernel-team@lists.ubuntu.com; Fri, 11 Oct 2013 10:42:46 +0000 Received: from bl20-141-76.dsl.telepac.pt ([2.81.141.76] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1VUaBB-0004In-Qw; Fri, 11 Oct 2013 10:42:46 +0000 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Subject: [PATCH 023/100] Revert "sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()" Date: Fri, 11 Oct 2013 11:40:53 +0100 Message-Id: <1381488130-30235-24-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1381488130-30235-1-git-send-email-luis.henriques@canonical.com> References: <1381488130-30235-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.5 Cc: David Miller , Michal Kubecek X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 3.5.7.23 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Luis Henriques 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 Cc: Michal Kubecek Signed-off-by: Luis Henriques --- 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: