diff options
| author |   David Howells <dhowells@redhat.com> | 2020-10-01 11:57:40 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2020-10-05 16:34:32 +0100 |
| commit | fa1d113a0f96f9ab7e4fe4f8825753ba1e34a9d3 (patch) | |
| tree | cb7b3d98dd566e396014ee970151af949f913356 | |
| parent | rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read() (diff) | |
| download | linux-dev-fa1d113a0f96f9ab7e4fe4f8825753ba1e34a9d3.tar.xz linux-dev-fa1d113a0f96f9ab7e4fe4f8825753ba1e34a9d3.zip | |
rxrpc: Fix some missing _bh annotations on locking conn->state_lock
conn->state_lock may be taken in softirq mode, but a previous patch
replaced an outer lock in the response-packet event handling code, and lost
the _bh from that when doing so.
Fix this by applying the _bh annotation to the state_lock locking.
Fixes: a1399f8bb033 ("rxrpc: Call channels should have separate call number spaces")
Signed-off-by: David Howells <dhowells@redhat.com>
| -rw-r--r-- | net/rxrpc/conn_event.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c index 447f55ca6886..6e972b4823ef 100644 --- a/net/rxrpc/conn_event.c +++ b/net/rxrpc/conn_event.c @@ -340,18 +340,18 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, return ret; spin_lock(&conn->channel_lock); - spin_lock(&conn->state_lock); + spin_lock_bh(&conn->state_lock); if (conn->state == RXRPC_CONN_SERVICE_CHALLENGING) { conn->state = RXRPC_CONN_SERVICE; - spin_unlock(&conn->state_lock); + spin_unlock_bh(&conn->state_lock); for (loop = 0; loop < RXRPC_MAXCALLS; loop++) rxrpc_call_is_secure( rcu_dereference_protected( conn->channels[loop].call, lockdep_is_held(&conn->channel_lock))); } else { - spin_unlock(&conn->state_lock); + spin_unlock_bh(&conn->state_lock); } spin_unlock(&conn->channel_lock); |