Re: [Qemu-devel] [PATCH] iscsi: fix missing unlock

[Philippe Mathieu-Daudé]

Hi Paolo,

On 03/03/2017 12:41 PM, Paolo Bonzini wrote:
> Reported by Coverity.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  block/iscsi.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/block/iscsi.c b/block/iscsi.c
> index 76319a1..75d8905 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -637,6 +637,7 @@ retry:
>      }
>  #endif
>      if (iTask.task == NULL) {
> +        qemu_mutex_unlock(&iscsilun->mutex);
>          return -ENOMEM;

what about:

        r = -ENOMEM;
        goto out_unlock;

to follow the file codestyle? (same following 3)

>      }
>  #if LIBISCSI_API_VERSION < (20160603)
> @@ -864,6 +865,7 @@ retry:
>      }
>  #endif
>      if (iTask.task == NULL) {
> +        qemu_mutex_unlock(&iscsilun->mutex);
>          return -ENOMEM;
>      }
>  #if LIBISCSI_API_VERSION < (20160603)
> @@ -904,6 +906,7 @@ static int coroutine_fn iscsi_co_flush(BlockDriverState *bs)
>  retry:
>      if (iscsi_synchronizecache10_task(iscsilun->iscsi, iscsilun->lun, 0, 0, 0,
>                                        0, iscsi_co_generic_cb, &iTask) == NULL) 
> {
> +        qemu_mutex_unlock(&iscsilun->mutex);
>          return -ENOMEM;
>      }
>
> @@ -1237,6 +1240,7 @@ retry:
>                                              0, 0, iscsi_co_generic_cb, &iTask);
>      }
>      if (iTask.task == NULL) {
> +        qemu_mutex_unlock(&iscsilun->mutex);
>          return -ENOMEM;
>      }