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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 38152C3A5A1 for ; Thu, 22 Aug 2019 17:11:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 035022089E for ; Thu, 22 Aug 2019 17:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566493893; bh=S4HhUcBWnP8kCVygmAhefXzJ2AmPVuCiTHanSqjrDFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YMB6hNkaQ0/N4uWp495djzuBBADmORMOMHKvaED8Bzq8zCeuntmDuMK17uuStkCa3 ZLa9JHHFjT/5iXaFYh+3ObnHDaTgef8OFncGUCXkzkWIasYjvZ64VDg9bDqNrEGR93 NGRKb/xF5HbANA1o2CzySZzM2LtIcQOma5QtlHv0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390910AbfHVRLc (ORCPT ); Thu, 22 Aug 2019 13:11:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:59622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390718AbfHVRJR (ORCPT ); Thu, 22 Aug 2019 13:09:17 -0400 Received: from sasha-vm.mshome.net (wsip-184-188-36-2.sd.sd.cox.net [184.188.36.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 10D45233FC; Thu, 22 Aug 2019 17:09:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566493756; bh=S4HhUcBWnP8kCVygmAhefXzJ2AmPVuCiTHanSqjrDFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y7BNN+kaHPgH89g5sV4Rw7wmZBIUnBA8nnmzsgom5G4pEnVSw4hunSwvZ8s0lp67g 8UR+zu13Fp2brV+2+EjjGuLXX7vLensOhWDcZdGu18cx7Gw+HgiKk7GlzecUJobhXy 22/43m4nU0HdR0qVtgE1liwdYcjOmI4PkXPlZA2c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xin Long , Marcelo Ricardo Leitner , Jakub Kicinski , Greg Kroah-Hartman Subject: [PATCH 5.2 114/135] sctp: fix the transport error_count check Date: Thu, 22 Aug 2019 13:07:50 -0400 Message-Id: <20190822170811.13303-115-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190822170811.13303-1-sashal@kernel.org> References: <20190822170811.13303-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.10-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.2.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.2.10-rc1 X-KernelTest-Deadline: 2019-08-24T17:07+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c index a554d6d15d1b6..1cf5bb5b73c41 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c @@ -546,7 +546,7 @@ static void sctp_do_8_2_transport_strike(struct sctp_cmd_seq *commands, */ 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, -- 2.20.1