| From 6b331ee35d86ae449b51549368dc84acb1ac4ec0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 24 Sep 2021 03:18:37 +0000 |
| Subject: rxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies() |
| |
| From: Jiasheng Jiang <jiasheng@iscas.ac.cn> |
| |
| [ 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: Jiasheng Jiang <jiasheng@iscas.ac.cn> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/rxrpc/rtt.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/net/rxrpc/rtt.c b/net/rxrpc/rtt.c |
| index 928d8b34a3eee..f3f87c9f0209d 100644 |
| --- a/net/rxrpc/rtt.c |
| +++ b/net/rxrpc/rtt.c |
| @@ -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) |
| -- |
| 2.33.0 |
| |
