[PATCH libdrm 1/2] etnaviv: prevent deadlock in error path

[Christian Gmeiner]

2017-08-21 12:57 GMT+02:00 Philipp Zabel <p.zabel at pengutronix.de>:
> If drmPrimeFDToHandle fails in etna_bo_from_dmabuf, the function must
> not return with the table_lock mutex held. There is no reason to call
> drmPrimeFDToHandle under that lock, so just take the lock after trying
> to obtain the handle.
>
> Based on ceb70a6b1015 ("freedreno: prevent deadlock in error path").
>
> Signed-off-by: Philipp Zabel <p.zabel at pengutronix.de>

Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>

> ---
>  etnaviv/etnaviv_bo.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/etnaviv/etnaviv_bo.c b/etnaviv/etnaviv_bo.c
> index 75669572..6c07d27f 100644
> --- a/etnaviv/etnaviv_bo.c
> +++ b/etnaviv/etnaviv_bo.c
> @@ -225,13 +225,13 @@ struct etna_bo *etna_bo_from_dmabuf(struct etna_device *dev, int fd)
>         int ret, size;
>         uint32_t handle;
>
> -       pthread_mutex_lock(&table_lock);
> -
>         ret = drmPrimeFDToHandle(dev->fd, fd, &handle);
>         if (ret) {
>                 return NULL;
>         }
>
> +       pthread_mutex_lock(&table_lock);
> +
>         bo = lookup_bo(dev->handle_table, handle);
>         if (bo)
>                 goto out_unlock;
> --
> 2.11.0
>
> _______________________________________________
> etnaviv mailing list
> etnaviv at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/etnaviv