diff options
| author | David Howells <dhowells@redhat.com> | 2016-06-28 16:58:36 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-07-06 10:43:51 +0100 |
| commit | 30b515f4d1cf31f6901c1fa61d920f651ebc07d7 (patch) | |
| tree | 5aa1d70a28264529c92067514ee8cb41321ce294 | |
| parent | dee46364ce6fd0815ad9da625783eda21ccf7b06 (diff) | |
| download | linux-30b515f4d1cf31f6901c1fa61d920f651ebc07d7.tar.bz2 | |
rxrpc: Access socket accept queue under right lock
The socket's accept queue (socket->acceptq) should be accessed under
socket->call_lock, not under the connection lock.
Signed-off-by: David Howells <dhowells@redhat.com>
| -rw-r--r-- | net/rxrpc/call_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c index 638d66df284a..fc32aa5764a2 100644 --- a/net/rxrpc/call_event.c +++ b/net/rxrpc/call_event.c @@ -1089,7 +1089,7 @@ void rxrpc_process_call(struct work_struct *work) if (call->state == RXRPC_CALL_SERVER_SECURING) { _debug("securing"); - write_lock(&call->conn->lock); + write_lock(&call->socket->call_lock); if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) && !test_bit(RXRPC_CALL_EV_RELEASE, &call->events)) { _debug("not released"); @@ -1097,7 +1097,7 @@ void rxrpc_process_call(struct work_struct *work) list_move_tail(&call->accept_link, &call->socket->acceptq); } - write_unlock(&call->conn->lock); + write_unlock(&call->socket->call_lock); read_lock(&call->state_lock); if (call->state < RXRPC_CALL_COMPLETE) set_bit(RXRPC_CALL_EV_POST_ACCEPT, &call->events); |