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,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 711D2C33CB8 for ; Thu, 16 Jan 2020 17:31:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3AD98246A3 for ; Thu, 16 Jan 2020 17:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195910; bh=SrTrD8YtD5BfvhQJJaI0IAtRzrpIvRNHyA98qwSJoM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=isJj1bsFIpF/djARGT/khFAUlNFBTz30fJTJkmRwm1F2uGZXU/lJOyOf5+s2PJMPZ JMUxicqpvj8blohBYPm6SqTvYLGxmmjA2lBmvTHUT5k5ryxU5EdBpKJLn/hn3a/oWr lijHSlfj4ZgP1K33WcTnJrXqWLEZg8YT2yIduOG8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404797AbgAPRbt (ORCPT ); Thu, 16 Jan 2020 12:31:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:44368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404729AbgAPRbO (ORCPT ); Thu, 16 Jan 2020 12:31:14 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 538A9246C3; Thu, 16 Jan 2020 17:31:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195874; bh=SrTrD8YtD5BfvhQJJaI0IAtRzrpIvRNHyA98qwSJoM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1OeUnHcumampfWuA5I50xkDMr9ewJDqzwLgxEmk7yeZpKrj0qYO74CgHndhdoqwZn BKUNBl/NhOzWcwlmb9DDkje+W/W5XhFYLiQdyqBVj1PVEtRhEeUaBC97jb2KUtQ0XP EB32XZBy++mR+NWrGw2DKf39oTgFQ/oN+vVNJVrs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tung Nguyen , Jon Maloy , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net Subject: [PATCH AUTOSEL 4.14 368/371] tipc: fix wrong timeout input for tipc_wait_for_cond() Date: Thu, 16 Jan 2020 12:24:00 -0500 Message-Id: <20200116172403.18149-311-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116172403.18149-1-sashal@kernel.org> References: <20200116172403.18149-1-sashal@kernel.org> MIME-Version: 1.0 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: Tung Nguyen [ Upstream commit 12db3c8083fcab4270866a88191933f2d9f24f89 ] 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: Sasha Levin --- net/tipc/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 21929ba196eb..d9ec6335c7dc 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -487,7 +487,7 @@ static void __tipc_shutdown(struct socket *sock, int error) 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; -- 2.20.1