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

Commit 8ec0a308 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

tcp: annotate data races in __tcp_oow_rate_limited() 



[ Upstream commit 998127cdb4699b9d470a9348ffe9f1154346be5f ]

request sockets are lockless, __tcp_oow_rate_limited() could be called
on the same object from different cpus. This is harmless.

Add READ_ONCE()/WRITE_ONCE() annotations to avoid a KCSAN report.

Fixes: 4ce7e93c ("tcp: rate limit ACK sent by SYN_RECV request sockets")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8fa6db24

net/ipv4/tcp_input.c

+9 −3
Original line number Diff line number Diff line
@@ -3429,8 +3429,11 @@ static int tcp_ack_update_window(struct sock *sk, const struct sk_buff *skb, u32 
static bool __tcp_oow_rate_limited(struct net *net, int mib_idx,

				   u32 *last_oow_ack_time)

{

	if (*last_oow_ack_time) {

		s32 elapsed = (s32)(tcp_jiffies32 - *last_oow_ack_time);

	/* Paired with the WRITE_ONCE() in this function. */

	u32 val = READ_ONCE(*last_oow_ack_time);



	if (val) {

		s32 elapsed = (s32)(tcp_jiffies32 - val);



		if (0 <= elapsed &&

		    elapsed < READ_ONCE(net->ipv4.sysctl_tcp_invalid_ratelimit)) {
@@ -3439,7 +3442,10 @@ static bool __tcp_oow_rate_limited(struct net *net, int mib_idx, 
		}

	}



	*last_oow_ack_time = tcp_jiffies32;

	/* Paired with the prior READ_ONCE() and with itself,

	 * as we might be lockless.

	 */

	WRITE_ONCE(*last_oow_ack_time, tcp_jiffies32);



	return false;	/* not rate-limited: go ahead, send dupack now! */

}