Skip to content

Commit

Permalink
rxrpc: Fix handling of connection failure in client call creation
Browse files Browse the repository at this point in the history
If rxrpc_connect_call() fails during the creation of a client connection,
there are two bugs that we can hit that need fixing:

 (1) The call state should be moved to RXRPC_CALL_DEAD before the call
     cleanup phase is invoked.  If not, this can cause an assertion failure
     later.

 (2) call->link should be reinitialised after being deleted in
     rxrpc_new_client_call() - which otherwise leads to a failure later
     when the call cleanup attempts to delete the link again.

Signed-off-by: David Howells <dhowells@redhat.com>
  • Loading branch information
David Howells committed Jul 6, 2016
1 parent 2c4579e commit d1e858c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion net/rxrpc/call_object.c
Original file line number Diff line number Diff line change
Expand Up @@ -425,9 +425,10 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx,
rxrpc_put_call(call);

write_lock_bh(&rxrpc_call_lock);
list_del(&call->link);
list_del_init(&call->link);
write_unlock_bh(&rxrpc_call_lock);

call->state = RXRPC_CALL_DEAD;
rxrpc_put_call(call);
_leave(" = %d", ret);
return ERR_PTR(ret);
Expand All @@ -439,6 +440,7 @@ struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx,
*/
found_user_ID_now_present:
write_unlock(&rx->call_lock);
call->state = RXRPC_CALL_DEAD;
rxrpc_put_call(call);
_leave(" = -EEXIST [%p]", call);
return ERR_PTR(-EEXIST);
Expand Down

0 comments on commit d1e858c

Please sign in to comment.