diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-11-12 08:43:18 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-15 18:36:38 -0500 |
| commit | 00fd38d938db3f1ab1c486549afc450cb7e751b1 (patch) | |
| tree | 484653a166b88da8777c900a01b2b8e0d5455147 /net/ipv4/tcp_diag.c | |
| parent | 5883d9c6d7e680bcdc7a8a9ed2509cd10dd98206 (diff) | |
| download | linux-00fd38d938db3f1ab1c486549afc450cb7e751b1.tar.bz2 | |
tcp: ensure proper barriers in lockless contexts
Some functions access TCP sockets without holding a lock and
might output non consistent data, depending on compiler and or
architecture.
tcp_diag_get_info(), tcp_get_info(), tcp_poll(), get_tcp4_sock() ...
Introduce sk_state_load() and sk_state_store() to fix the issues,
and more clearly document where this lack of locking is happening.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_diag.c')
| -rw-r--r-- | net/ipv4/tcp_diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c index 479f34946177..b31604086edd 100644 --- a/net/ipv4/tcp_diag.c +++ b/net/ipv4/tcp_diag.c @@ -21,7 +21,7 @@ static void tcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r, { struct tcp_info *info = _info; - if (sk->sk_state == TCP_LISTEN) { + if (sk_state_load(sk) == TCP_LISTEN) { r->idiag_rqueue = sk->sk_ack_backlog; r->idiag_wqueue = sk->sk_max_ack_backlog; } else if (sk->sk_type == SOCK_STREAM) { |