Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67463727 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

rxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies() 



[ Upstream commit acde891c243c1ed85b19d4d5042bdf00914f5739 ]

Directly using _usecs_to_jiffies() might be unsafe, so it's
better to use usecs_to_jiffies() instead.
Because we can see that the result of _usecs_to_jiffies()
could be larger than MAX_JIFFY_OFFSET values without the
check of the input.

Fixes: c410bf01933e ("Fix the excessive initial retransmission timeout")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d4cd7a16

net/rxrpc/rtt.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static u32 rxrpc_rto_min_us(struct rxrpc_peer *peer) 


static u32 __rxrpc_set_rto(const struct rxrpc_peer *peer)

{

	return _usecs_to_jiffies((peer->srtt_us >> 3) + peer->rttvar_us);

	return usecs_to_jiffies((peer->srtt_us >> 3) + peer->rttvar_us);

}



static u32 rxrpc_bound_rto(u32 rto)