Skip to content

Commit a41a607

Browse files
q2venRezaT4795
authored andcommitted
tcp: Fix a data-race around sysctl_tcp_comp_sack_delay_ns.
[ Upstream commit 4866b2b0f7672b6d760c4b8ece6fb56f965dcc8a ] While reading sysctl_tcp_comp_sack_delay_ns, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: 6d82aa2 ("tcp: add tcp_comp_sack_delay_ns sysctl") Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 092b5b5 commit a41a607

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

net/ipv4/tcp_input.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5512,7 +5512,8 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible)
55125512
if (tp->srtt_us && tp->srtt_us < rtt)
55135513
rtt = tp->srtt_us;
55145514

5515-
delay = min_t(unsigned long, sock_net(sk)->ipv4.sysctl_tcp_comp_sack_delay_ns,
5515+
delay = min_t(unsigned long,
5516+
READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_comp_sack_delay_ns),
55165517
rtt * (NSEC_PER_USEC >> 3)/20);
55175518
sock_hold(sk);
55185519
hrtimer_start_range_ns(&tp->compressed_ack_timer, ns_to_ktime(delay),

0 commit comments

Comments
 (0)