Commit 85225e6f authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by David S. Miller
Browse files

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: f54b3111 ("tcp: auto corking")
Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1330ffac

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -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);