diff options
| author |   David Howells <dhowells@redhat.com> | 2016-10-06 08:11:48 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-10-06 08:11:48 +0100 |
| commit | b63452c11e22382e592d3f7f9ac4966197d3eab6 (patch) | |
| tree | 327105b7e1b14446cef73b4fff2d2985d6f9a9c4 /net/rxrpc/af_rxrpc.c | |
| parent | phy: micrel.c: Enable ksz9031 energy-detect power-down mode (diff) | |
| download | linux-dev-b63452c11e22382e592d3f7f9ac4966197d3eab6.tar.xz linux-dev-b63452c11e22382e592d3f7f9ac4966197d3eab6.zip | |
rxrpc: Accesses of rxrpc_local::service need to be RCU managed
struct rxrpc_local->service is marked __rcu - this means that accesses of
it need to be managed using RCU wrappers. There are two such places in
rxrpc_release_sock() where the value is checked and cleared. Fix this by
using the appropriate wrappers.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | net/rxrpc/af_rxrpc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c index 44c9c2b0b190..2d59c9be40e1 100644 --- a/net/rxrpc/af_rxrpc.c +++ b/net/rxrpc/af_rxrpc.c @@ -678,9 +678,9 @@ static int rxrpc_release_sock(struct sock *sk) sk->sk_state = RXRPC_CLOSE; spin_unlock_bh(&sk->sk_receive_queue.lock); - if (rx->local && rx->local->service == rx) { + if (rx->local && rcu_access_pointer(rx->local->service) == rx) { write_lock(&rx->local->services_lock); - rx->local->service = NULL; + rcu_assign_pointer(rx->local->service, NULL); write_unlock(&rx->local->services_lock); } |