From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755288Ab3AWNrJ (ORCPT ); Wed, 23 Jan 2013 08:47:09 -0500 Received: from charlotte.tuxdriver.com ([70.61.120.58]:60153 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754381Ab3AWNrH (ORCPT ); Wed, 23 Jan 2013 08:47:07 -0500 Date: Wed, 23 Jan 2013 08:46:50 -0500 From: Neil Horman To: xufengzhang.main@gmail.com Cc: vyasevich@gmail.com, sri@us.ibm.com, davem@davemloft.net, linux-sctp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] sctp: set association state to established in dupcook_a handler Message-ID: <20130123134650.GA3512@hmsreliant.think-freely.org> References: <1358926720-25557-1-git-send-email-xufengzhang.main@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1358926720-25557-1-git-send-email-xufengzhang.main@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Score: -2.9 (--) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 23, 2013 at 03:38:40PM +0800, 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. > > Fix this problem by adding a SCTP_CMD_NEW_STATE cmd to the command > list so as to set the restart association to SCTP_STATE_ESTABLISHED > state properly. > > Signed-off-by: Xufeng Zhang > --- > net/sctp/sm_statefuns.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c > index 618ec7e..528f1c8 100644 > --- a/net/sctp/sm_statefuns.c > +++ b/net/sctp/sm_statefuns.c > @@ -1779,6 +1779,8 @@ 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_NEW_STATE, > + SCTP_STATE(SCTP_STATE_ESTABLISHED)); > sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(repl)); > sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP, SCTP_ULPEVENT(ev)); > return SCTP_DISPOSITION_CONSUME; > -- > 1.7.0.2 > > Looks reasonable to me, thanks nit: The RFC indicate the association should enter the ESTABLISHED state after preforming all other actions, so it seems that the state change should occur after the ULP event is sent Neil