pá 11. 11. 2022 v 16:47 odesílatel Maurizio Lombardi
<mlombard@xxxxxxxxxx> napsal:
>
>
> Fix this bug by forcing login_work to stop after the login has been
> completed and the socket callbacks have been restored.
> Also fix other potential race conditions in the error paths.
Self-NACK
I can't call cancel_delayed_work_sync() in iscsi_target_do_login()
because the latter could be called from the login_work context
and this will cause a deadlock.
Will submit a V3 when ready
>
> V2: remove an unnecessary call to cancel_delayed_work();
> fix a potential race condition in iscsi_start_negotiation() and
> in iscsi_target_do_login_rx()'s error paths
>
> Signed-off-by: Maurizio Lombardi <mlombard@xxxxxxxxxx>
> ---
> drivers/target/iscsi/iscsi_target_nego.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/target/iscsi/iscsi_target_nego.c b/drivers/target/iscsi/iscsi_target_nego.c
> index f2919319ad38..465c53b9ddb3 100644
> --- a/drivers/target/iscsi/iscsi_target_nego.c
> +++ b/drivers/target/iscsi/iscsi_target_nego.c
> @@ -645,7 +645,6 @@ static void iscsi_target_do_login_rx(struct work_struct *work)
> LOGIN_FLAGS_WRITE_ACTIVE))
> goto err;
> } else if (rc == 1) {
> - cancel_delayed_work(&conn->login_work);
> iscsi_target_nego_release(conn);
> iscsi_post_login_handler(np, conn, zero_tsih);
> iscsit_deaccess_np(np, tpg, tpg_np);
> @@ -654,7 +653,7 @@ static void iscsi_target_do_login_rx(struct work_struct *work)
>
> err:
> iscsi_target_restore_sock_callbacks(conn);
> - cancel_delayed_work(&conn->login_work);
> + cancel_delayed_work_sync(&conn->login_work);
> iscsi_target_login_drop(conn, login);
> iscsit_deaccess_np(np, tpg, tpg_np);
> }
> @@ -1058,6 +1057,7 @@ static int iscsi_target_do_login(struct iscsit_conn *conn, struct iscsi_login *l
> login->tsih = conn->sess->tsih;
> login->login_complete = 1;
> iscsi_target_restore_sock_callbacks(conn);
> + cancel_delayed_work_sync(&conn->login_work);
> if (iscsi_target_do_tx_login_io(conn,
> login) < 0)
> return -1;
> @@ -1363,8 +1363,8 @@ int iscsi_target_start_negotiation(
> ret = -1;
>
> if (ret < 0) {
> - cancel_delayed_work_sync(&conn->login_work);
> iscsi_target_restore_sock_callbacks(conn);
> + cancel_delayed_work_sync(&conn->login_work);
> iscsi_remove_failed_auth_entry(conn);
> }
> if (ret != 0)
> --
> 2.31.1
>
