| Message ID | 20220321042229.314288-1-hoang.h.le@dektech.com.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6a7d8cff4a3301087dd139293e9bddcf63827282 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] tipc: fix the timer expires after interval 100ms | expand |
Hello: This patch was applied to netdev/net.git (master) by Paolo Abeni <pabeni@redhat.com>: On Mon, 21 Mar 2022 11:22:29 +0700 you wrote: > 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. > > [...] Here is the summary with links: - [net] tipc: fix the timer expires after interval 100ms https://git.kernel.org/netdev/net/c/6a7d8cff4a33 You are awesome, thank you!
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 */
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> --- net/tipc/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)