From: Kuniyuki Iwashima Date: Wed, 20 Jul 2022 16:50:25 +0000 (-0700) Subject: tcp: Fix a data-race around sysctl_tcp_autocorking. X-Git-Tag: baikal/mips/sdk6.1~5253^2~32^2~1 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=19ea5d82bf8a1597152f84b9887e1887cc5b3641;p=kernel.git tcp: Fix a data-race around sysctl_tcp_autocorking. While reading sysctl_tcp_autocorking, it can be changed concurrently. Thus, we need to add READ_ONCE() to its reader. Fixes: 4aed7f27920e ("tcp: auto corking") Signed-off-by: Kuniyuki Iwashima Signed-off-by: David S. Miller --- diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 2faaaaf540ac1..a11e5de3a4c36 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -686,7 +686,7 @@ static bool tcp_should_autocork(struct sock *sk, struct sk_buff *skb, int size_goal) { return skb->len < size_goal && - sock_net(sk)->ipv4.sysctl_tcp_autocorking && + READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_autocorking) && !tcp_rtx_queue_empty(sk) && refcount_read(&sk->sk_wmem_alloc) > skb->truesize && tcp_skb_can_collapse_to(skb);