Skip to content

Commit fa1d113

Browse files
committed
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: a1399f8 ("rxrpc: Call channels should have separate call number spaces") Signed-off-by: David Howells <dhowells@redhat.com>
1 parent 9a059cd commit fa1d113

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

net/rxrpc/conn_event.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,18 +340,18 @@ static int rxrpc_process_event(struct rxrpc_connection *conn,
340340
return ret;
341341

342342
spin_lock(&conn->channel_lock);
343-
spin_lock(&conn->state_lock);
343+
spin_lock_bh(&conn->state_lock);
344344

345345
if (conn->state == RXRPC_CONN_SERVICE_CHALLENGING) {
346346
conn->state = RXRPC_CONN_SERVICE;
347-
spin_unlock(&conn->state_lock);
347+
spin_unlock_bh(&conn->state_lock);
348348
for (loop = 0; loop < RXRPC_MAXCALLS; loop++)
349349
rxrpc_call_is_secure(
350350
rcu_dereference_protected(
351351
conn->channels[loop].call,
352352
lockdep_is_held(&conn->channel_lock)));
353353
} else {
354-
spin_unlock(&conn->state_lock);
354+
spin_unlock_bh(&conn->state_lock);
355355
}
356356

357357
spin_unlock(&conn->channel_lock);

0 commit comments

Comments
 (0)