]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
tipc: fix the timer expires after interval 100ms
authorHoang Le <hoang.h.le@dektech.com.au>
Mon, 21 Mar 2022 04:22:29 +0000 (11:22 +0700)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 12:39:17 +0000 (14:39 +0200)
commit5dc9f833991e2904f3272e4d9c84e20d792f905b
treeebe38f80608de45bf02b7fd7a2cfb70f4fdbc689
parent1d4b4ee67beb96cc6d37d50d0c63ccee2d099413
tipc: fix the timer expires after interval 100ms

BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit 6a7d8cff4a3301087dd139293e9bddcf63827282 ]

In the timer callback function tipc_sk_timeout(), we're trying to
reschedule another timeout to retransmit a setup request if destination
link is congested. But we use the incorrect timeout value
(msecs_to_jiffies(100)) instead of (jiffies + msecs_to_jiffies(100)),
so that the timer expires immediately, it's irrelevant for original
description.

In this commit we correct the timeout value in sk_reset_timer()

Fixes: 6787927475e5 ("tipc: buffer overflow handling in listener socket")
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
Link: https://lore.kernel.org/r/20220321042229.314288-1-hoang.h.le@dektech.com.au
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 21a2b4ab48a4878205825f2c8344a49edad8476d)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
net/tipc/socket.c