lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 225/475] tipc: fix the timer expires after interval 100ms
    Date
    From: Hoang Le <hoang.h.le@dektech.com.au>

    [ 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>
    ---
    net/tipc/socket.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/net/tipc/socket.c b/net/tipc/socket.c
    index f4217673eee7..d543c4556df2 100644
    --- a/net/tipc/socket.c
    +++ b/net/tipc/socket.c
    @@ -2698,7 +2698,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 */
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-14 17:08    [W:7.867 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site