Re: [PATCH libdrm v3] etnaviv: prevent deadlock in error path

[Eric Engestrom]

On Wednesday, 2017-09-13 16:08:19 +0200, Philipp Zabel wrote:
> If drmPrimeFDToHandle fails in etna_bo_from_dmabuf, the function must
> not return with the table_lock mutex held. Unlock the mutex in the error
> path.
> 
> Based on ceb70a6b1015 ("freedreno: prevent deadlock in error path").
> 
> Signed-off-by: Philipp Zabel 
> Reviewed-by: Eric Engestrom 
> ---
> v3: fix the commit message to correspond to the code in v2/v3

Thanks, pushed now :)

> ---
>  etnaviv/etnaviv_bo.c | 5 +
>  1 file changed, 5 insertions(+)
> 
> diff --git a/etnaviv/etnaviv_bo.c b/etnaviv/etnaviv_bo.c
> index 4fe877f1..78b9cd27 100644
> --- a/etnaviv/etnaviv_bo.c
> +++ b/etnaviv/etnaviv_bo.c
> @@ -206,10 +206,15 @@ struct etna_bo *etna_bo_from_dmabuf(struct etna_device 
> *dev, int fd)
>   int ret, size;
>   uint32_t handle;
>  
> + /* take the lock before calling drmPrimeFDToHandle to avoid
> +  * racing against etna_bo_del, which might invalidate the
> +  * returned handle.
> +  */
>   pthread_mutex_lock(_lock);
>  
>   ret = drmPrimeFDToHandle(dev->fd, fd, );
>   if (ret) {
> + pthread_mutex_unlock(_lock);
>   return NULL;
>   }
>  
> -- 
> 2.11.0
> 
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH libdrm v3] etnaviv: prevent deadlock in error path

[Philipp Zabel]

If drmPrimeFDToHandle fails in etna_bo_from_dmabuf, the function must
not return with the table_lock mutex held. Unlock the mutex in the error
path.

Based on ceb70a6b1015 ("freedreno: prevent deadlock in error path").

Signed-off-by: Philipp Zabel 
Reviewed-by: Eric Engestrom 
---
v3: fix the commit message to correspond to the code in v2/v3
---
 etnaviv/etnaviv_bo.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/etnaviv/etnaviv_bo.c b/etnaviv/etnaviv_bo.c
index 4fe877f1..78b9cd27 100644
--- a/etnaviv/etnaviv_bo.c
+++ b/etnaviv/etnaviv_bo.c
@@ -206,10 +206,15 @@ struct etna_bo *etna_bo_from_dmabuf(struct etna_device 
*dev, int fd)
int ret, size;
uint32_t handle;
 
+   /* take the lock before calling drmPrimeFDToHandle to avoid
+* racing against etna_bo_del, which might invalidate the
+* returned handle.
+*/
pthread_mutex_lock(_lock);
 
ret = drmPrimeFDToHandle(dev->fd, fd, );
if (ret) {
+   pthread_mutex_unlock(_lock);
return NULL;
}
 
-- 
2.11.0

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel