lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 010/639] tipc: fix wrong timeout input for tipc_wait_for_cond()
    Date
    From: Tung Nguyen <tung.q.nguyen@dektech.com.au>

    commit 12db3c8083fcab4270866a88191933f2d9f24f89 upstream.

    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 <tung.q.nguyen@dektech.com.au>
    Acked-by: Jon Maloy <jon.maloy@ericsson.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    net/tipc/socket.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/tipc/socket.c
    +++ b/net/tipc/socket.c
    @@ -501,7 +501,7 @@ static void __tipc_shutdown(struct socke
    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;


    \
     
     \ /
      Last update: 2020-01-24 11:09    [W:4.136 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site