Re: [PULL 03/11] block/iscsi: fix double-free on BUSY or similar statuses

[Fiona Ebner]

Am 08.02.23 um 18:19 schrieb Paolo Bonzini:
> Commit 8c460269aa77 ("iscsi: base all handling of check condition on
> scsi_sense_to_errno", 2019-07-15) removed a "goto out" so that the
> same coroutine is re-entered twice; once from iscsi_co_generic_cb,
> once from the timer callback iscsi_retry_timer_expired.  This can
> cause a crash.
> 
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1378
> Reported-by: Grzegorz Zdanowski <https://gitlab.com/kiler129>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  block/iscsi.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/block/iscsi.c b/block/iscsi.c
> index b3e10f40b649..3aacd0709f93 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -269,6 +269,7 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int 
> status,
>                  timer_mod(&iTask->retry_timer,
>                            qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 
> retry_time);
>                  iTask->do_retry = 1;
> +                return;
>              } else if (status == SCSI_STATUS_CHECK_CONDITION) {
>                  int error = iscsi_translate_sense(&task->sense);
>                  if (error == EAGAIN) {

Thank you for the fix! CC-ing stable, because this is a regression fix.