From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F07F5C3A5A1 for ; Thu, 22 Aug 2019 17:39:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDDE3233FC for ; Thu, 22 Aug 2019 17:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566495556; bh=FWi77/lppBIOBBlfD5y2SgJK0wYJVg47OoT2P6y9i/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tpLjFCMHS4wJ41z8tpFgoLCTG/iSAkz8B2ji8z4Zso2LenwiC/ewjqsNLY2N2jsfm 3Oj4U24SAYLjV04BbdwCuvw5jJi8QXQRcJlJ8ziSOGVQr2MQIogWlznI/ywJ/pBgE8 0SsLWM8/4Z8bogjqGXenW9SyBtrXa4+R8oruC29E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404152AbfHVRYR (ORCPT ); Thu, 22 Aug 2019 13:24:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:45590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404148AbfHVRYR (ORCPT ); Thu, 22 Aug 2019 13:24:17 -0400 Received: from localhost (wsip-184-188-36-2.sd.sd.cox.net [184.188.36.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 78A2F21743; Thu, 22 Aug 2019 17:24:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566494656; bh=FWi77/lppBIOBBlfD5y2SgJK0wYJVg47OoT2P6y9i/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hfVI4yzQES62R9pYaneZBw1Idddzjl0s+PIlAZoYEHIobapjLnpm2SHo3S3Y/8UFD 68UJkiApfdD6OWfIjSPT8fXECwjSToTK5SEJfFILwUX2vpeiP4w+XtMYXHF6vi/wZm jwC81gjL5q9TUal2KGcyiL+ull4oE9Du4xjPurd4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xin Long , Marcelo Ricardo Leitner , Jakub Kicinski Subject: [PATCH 4.9 098/103] sctp: fix the transport error_count check Date: Thu, 22 Aug 2019 10:19:26 -0700 Message-Id: <20190822171733.115889899@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822171728.445189830@linuxfoundation.org> References: <20190822171728.445189830@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Xin Long [ Upstream commit a1794de8b92ea6bc2037f445b296814ac826693e ] As the annotation says in sctp_do_8_2_transport_strike(): "If the transport error count is greater than the pf_retrans threshold, and less than pathmaxrtx ..." It should be transport->error_count checked with pathmaxrxt, instead of asoc->pf_retrans. Fixes: 5aa93bcf66f4 ("sctp: Implement quick failover draft from tsvwg") Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/sctp/sm_sideeffect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c @@ -508,7 +508,7 @@ static void sctp_do_8_2_transport_strike */ if (net->sctp.pf_enable && (transport->state == SCTP_ACTIVE) && - (asoc->pf_retrans < transport->pathmaxrxt) && + (transport->error_count < transport->pathmaxrxt) && (transport->error_count > asoc->pf_retrans)) { sctp_assoc_control_transport(asoc, transport,