]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tcp: tcp_get_info() should fetch socket fields once
authorEric Dumazet <edumazet@google.com>
Thu, 16 Apr 2015 23:12:28 +0000 (16:12 -0700)
committerSasha Levin <sasha.levin@oracle.com>
Sun, 28 Jun 2015 17:39:26 +0000 (13:39 -0400)
[ Upstream commit fad9dfefea6405039491e7e4fc21fb6e59e7d26c ]

tcp_get_info() can be called without holding socket lock,
so any socket fields can change under us.

Use READ_ONCE() to fetch sk_pacing_rate and sk_max_pacing_rate

Fixes: 977cb0ecf82e ("tcp: add pacing_rate information into tcp_info")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
net/ipv4/tcp.c

index 38c2bcb8dd5da4f2c8dede10942a1388fd3d9954..de6195485b318a4bf50940aabc09d8af56c9b03b 100644 (file)
@@ -2639,6 +2639,7 @@ void tcp_get_info(const struct sock *sk, struct tcp_info *info)
        const struct tcp_sock *tp = tcp_sk(sk);
        const struct inet_connection_sock *icsk = inet_csk(sk);
        u32 now = tcp_time_stamp;
+       u32 rate;
 
        memset(info, 0, sizeof(*info));
 
@@ -2699,10 +2700,11 @@ void tcp_get_info(const struct sock *sk, struct tcp_info *info)
 
        info->tcpi_total_retrans = tp->total_retrans;
 
-       info->tcpi_pacing_rate = sk->sk_pacing_rate != ~0U ?
-                                       sk->sk_pacing_rate : ~0ULL;
-       info->tcpi_max_pacing_rate = sk->sk_max_pacing_rate != ~0U ?
-                                       sk->sk_max_pacing_rate : ~0ULL;
+       rate = READ_ONCE(sk->sk_pacing_rate);
+       info->tcpi_pacing_rate = rate != ~0U ? rate : ~0ULL;
+
+       rate = READ_ONCE(sk->sk_max_pacing_rate);
+       info->tcpi_max_pacing_rate = rate != ~0U ? rate : ~0ULL;
 }
 EXPORT_SYMBOL_GPL(tcp_get_info);