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 E7531C3A5A1 for ; Thu, 22 Aug 2019 17:45:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD92320856 for ; Thu, 22 Aug 2019 17:45:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566495937; bh=kPZgBqXK1ec+E6PhqpNX2CR9zt1hXQLy8RSEqu1PTYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ka5dV29Qy5h79qRITAVo4Sz/8sfGpQ1kN/7zxW5aYag+yucAl46A5gTecK/p9IjYi VEJl+tpg4RKPyeoI8ayCtC9+vUAjU3oF+Znhmq8jG8k/gj5NiwY4zvtwdA/28nawTp Aj6mljv/kX8qL/NKFjY2iD2S6um+lHDTKlnqUMwE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393001AbfHVRpg (ORCPT ); Thu, 22 Aug 2019 13:45:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:42344 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403809AbfHVRXE (ORCPT ); Thu, 22 Aug 2019 13:23:04 -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 22C0123402; Thu, 22 Aug 2019 17:23:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566494584; bh=kPZgBqXK1ec+E6PhqpNX2CR9zt1hXQLy8RSEqu1PTYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zMr2XEPF09rY4VbWcb7IozB0RCkRFR5e/RXbvXFbWy+Wyx1ZMF+bdxlwoIJ6SD8z8 StzRSVI9Xa8zxmxVvx2v8TRkGiMwIQ3T5uHv/G7HBQJRUbSYsO5FPx4e504WsWD7cE QuAN8JoQBAJGqjkQzV4wf9ioTzil9jrXzE0hm3Ns= 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.4 77/78] sctp: fix the transport error_count check Date: Thu, 22 Aug 2019 10:19:21 -0700 Message-Id: <20190822171834.261598070@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822171832.012773482@linuxfoundation.org> References: <20190822171832.012773482@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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(-) --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c @@ -504,7 +504,7 @@ static void sctp_do_8_2_transport_strike * see SCTP Quick Failover Draft, section 5.1 */ if ((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,