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,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 0C6D4C35242 for ; Fri, 24 Jan 2020 10:09:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB91F2077C for ; Fri, 24 Jan 2020 10:09:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860543; bh=1PhDrFQUblKDeG2RNppE13vr8ZJX73edvGecStNf82w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1M0e4fz5hBlLbWbjDCVMX6KL7l6wIhD65SEzcEOkMMSspz3mf3O7m9/KbGqEFAlvV 71JJ7C3DHqXoO9i/aFsLnUI5J2AqEDXaJfwfLPi6WiBwemNM7QgJNgBlELnjVOwtc/ hcJB0ymzAv9vaJQadtquWQczJ8qmP2jKld6M9TBc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389571AbgAXKJC (ORCPT ); Fri, 24 Jan 2020 05:09:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:45856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733082AbgAXKJB (ORCPT ); Fri, 24 Jan 2020 05:09:01 -0500 Received: from localhost (unknown [145.15.244.15]) (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 5B75D20709; Fri, 24 Jan 2020 10:09:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860540; bh=1PhDrFQUblKDeG2RNppE13vr8ZJX73edvGecStNf82w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bX3GcEQGwCO3iST6xcLkqklMjkgmPeTdKPPO8egTmmBT1hKHfW/+bQfdNKulv/Pf+ wkQfOg5QfZihSVjNJaffxzRB2I2Nl6ISdDyOA6or3xIObM/obX9R1Iz1gt6NklDrPj mWog75FBjtiVX5/G7lMIy9asEaE2JVbPqvlT5upE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tung Nguyen , Jon Maloy , "David S. Miller" Subject: [PATCH 4.19 010/639] tipc: fix wrong timeout input for tipc_wait_for_cond() Date: Fri, 24 Jan 2020 10:23:00 +0100 Message-Id: <20200124093048.355200483@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@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: Tung Nguyen commit 12db3c8083fcab4270866a88191933f2d9f24f89 upstream. In function __tipc_shutdown(), the timeout value passed to tipc_wait_for_cond() is not jiffies. This commit fixes it by converting that value from milliseconds to jiffies. Fixes: 365ad353c256 ("tipc: reduce risk of user starvation during link congestion") Signed-off-by: Tung Nguyen Acked-by: Jon Maloy Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/tipc/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -501,7 +501,7 @@ static void __tipc_shutdown(struct socke struct sock *sk = sock->sk; struct tipc_sock *tsk = tipc_sk(sk); struct net *net = sock_net(sk); - long timeout = CONN_TIMEOUT_DEFAULT; + long timeout = msecs_to_jiffies(CONN_TIMEOUT_DEFAULT); u32 dnode = tsk_peer_node(tsk); struct sk_buff *skb;