From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753852Ab3AXPFo (ORCPT ); Thu, 24 Jan 2013 10:05:44 -0500 Received: from mail-qc0-f175.google.com ([209.85.216.175]:34160 "EHLO mail-qc0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752920Ab3AXPFl (ORCPT ); Thu, 24 Jan 2013 10:05:41 -0500 Message-ID: <51014DC1.4070209@gmail.com> Date: Thu, 24 Jan 2013 10:05:37 -0500 From: Vlad Yasevich User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: xufengzhang.main@gmail.com CC: nhorman@tuxdriver.com, davem@davemloft.net, linux-sctp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] sctp: set association state to established in dupcook_a handler References: <1358995474-28369-1-git-send-email-xufengzhang.main@gmail.com> In-Reply-To: <1358995474-28369-1-git-send-email-xufengzhang.main@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/23/2013 09:44 PM, xufengzhang.main@gmail.com wrote: > From: Xufeng Zhang > > While sctp handling a duplicate COOKIE-ECHO and the action is > 'Association restart', sctp_sf_do_dupcook_a() will processing > the unexpected COOKIE-ECHO for peer restart, but it does not set > the association state to SCTP_STATE_ESTABLISHED, so the association > could stuck in SCTP_STATE_SHUTDOWN_PENDING state forever. > This violates the sctp specification: > RFC 4960 5.2.4. Handle a COOKIE ECHO when a TCB Exists > Action > A) In this case, the peer may have restarted. ..... > After this, the endpoint shall enter the ESTABLISHED state. > > To resolve this problem, adding a SCTP_CMD_NEW_STATE cmd to the > command list before SCTP_CMD_REPLY cmd, this will set the restart > association to SCTP_STATE_ESTABLISHED state properly and also avoid > I-bit being set in the DATA chunk header when COOKIE_ACK is bundled > with DATA chunks. > > Signed-off-by: Xufeng Zhang Acked-by: Vlad Yasevich -vlad > --- > v2: > - Put the SCTP_CMD_NEW_STATE command before SCTP_CMD_REPLY and after SCTP_CMD_EVENT_ULP > suggested by Vlad and Neil > - Improve the last paragraph of the commit header > > net/sctp/sm_statefuns.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c > index 618ec7e..5131fcf 100644 > --- a/net/sctp/sm_statefuns.c > +++ b/net/sctp/sm_statefuns.c > @@ -1779,8 +1779,10 @@ static sctp_disposition_t sctp_sf_do_dupcook_a(struct net *net, > > /* Update the content of current association. */ > sctp_add_cmd_sf(commands, SCTP_CMD_UPDATE_ASSOC, SCTP_ASOC(new_asoc)); > - sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(repl)); > sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP, SCTP_ULPEVENT(ev)); > + sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE, > + SCTP_STATE(SCTP_STATE_ESTABLISHED)); > + sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(repl)); > return SCTP_DISPOSITION_CONSUME; > > nomem_ev: >