diff options
| author |   Hoang Le <hoang.h.le@dektech.com.au> | 2022-03-21 11:22:29 +0700 |
|---|---|---|
| committer |   Paolo Abeni <pabeni@redhat.com> | 2022-03-22 10:50:46 +0100 |
| commit | 6a7d8cff4a3301087dd139293e9bddcf63827282 (patch) | |
| tree | c95f9d0d97ad7863775a9c0df12b24da25adcfb2 /net/tipc/socket.c | |
| parent | net: wwan: qcom_bam_dmux: fix wrong pointer passed to IS_ERR() (diff) | |
| download | linux-dev-6a7d8cff4a3301087dd139293e9bddcf63827282.tar.xz linux-dev-6a7d8cff4a3301087dd139293e9bddcf63827282.zip | |
tipc: fix the timer expires after interval 100ms
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>
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 7545321c3440..17f8c523e33b 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2852,7 +2852,8 @@ static void tipc_sk_retry_connect(struct sock *sk, struct sk_buff_head *list) /* Try again later if dest link is congested */ if (tsk->cong_link_cnt) { - sk_reset_timer(sk, &sk->sk_timer, msecs_to_jiffies(100)); + sk_reset_timer(sk, &sk->sk_timer, + jiffies + msecs_to_jiffies(100)); return; } /* Prepare SYN for retransmit */ |