rxrpc: Fix handling of connection failure in client call creation
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>
This commit is contained in:
Родитель
2c4579e4b1
Коммит
d1e858c5a3
|
@ -425,9 +425,10 @@ error:
|
||||||
rxrpc_put_call(call);
|
rxrpc_put_call(call);
|
||||||
|
|
||||||
write_lock_bh(&rxrpc_call_lock);
|
write_lock_bh(&rxrpc_call_lock);
|
||||||
list_del(&call->link);
|
list_del_init(&call->link);
|
||||||
write_unlock_bh(&rxrpc_call_lock);
|
write_unlock_bh(&rxrpc_call_lock);
|
||||||
|
|
||||||
|
call->state = RXRPC_CALL_DEAD;
|
||||||
rxrpc_put_call(call);
|
rxrpc_put_call(call);
|
||||||
_leave(" = %d", ret);
|
_leave(" = %d", ret);
|
||||||
return ERR_PTR(ret);
|
return ERR_PTR(ret);
|
||||||
|
@ -439,6 +440,7 @@ error:
|
||||||
*/
|
*/
|
||||||
found_user_ID_now_present:
|
found_user_ID_now_present:
|
||||||
write_unlock(&rx->call_lock);
|
write_unlock(&rx->call_lock);
|
||||||
|
call->state = RXRPC_CALL_DEAD;
|
||||||
rxrpc_put_call(call);
|
rxrpc_put_call(call);
|
||||||
_leave(" = -EEXIST [%p]", call);
|
_leave(" = -EEXIST [%p]", call);
|
||||||
return ERR_PTR(-EEXIST);
|
return ERR_PTR(-EEXIST);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче