diff options
| author |   Kuniyuki Iwashima <kuniyu@amazon.com> | 2022-07-22 11:22:01 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2022-07-25 12:42:09 +0100 |
| commit | 4866b2b0f7672b6d760c4b8ece6fb56f965dcc8a (patch) | |
| tree | a092b310a82f9cb47287056c35596ef21f8963b3 | |
| parent | net: Fix data-races around sysctl_[rw]mem(_offset)?. (diff) | |
| download | linux-dev-4866b2b0f7672b6d760c4b8ece6fb56f965dcc8a.tar.xz linux-dev-4866b2b0f7672b6d760c4b8ece6fb56f965dcc8a.zip | |
tcp: Fix a data-race around sysctl_tcp_comp_sack_delay_ns.
While reading sysctl_tcp_comp_sack_delay_ns, it can be changed
concurrently. Thus, we need to add READ_ONCE() to its reader.
Fixes: 6d82aa242092 ("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>
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index ff2e0d87aee4..813744180d87 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5542,7 +5542,8 @@ send_now: if (tp->srtt_us && tp->srtt_us < rtt) rtt = tp->srtt_us; - delay = min_t(unsigned long, sock_net(sk)->ipv4.sysctl_tcp_comp_sack_delay_ns, + delay = min_t(unsigned long, + READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_comp_sack_delay_ns), rtt * (NSEC_PER_USEC >> 3)/20); sock_hold(sk); hrtimer_start_range_ns(&tp->compressed_ack_timer, ns_to_ktime(delay), |