Re: [PATCH] drm/msm: unlock on error in msm_gem_get_iova()

Sushmita Susheelendra
2017-07-10T17:51:33Z

Thanks for the catch!

-Sushmita

On 2017-07-10 01:20, Dan Carpenter wrote:
> We recently added locking to this function but there was a direct
> return
> that was overlooked where we need to unlock.
>
> Fixes: 0e08270a1f01 ("drm/msm: Separate locking of buffer resources
> from struct_mutex")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/gpu/drm/msm/msm_gem.c
> b/drivers/gpu/drm/msm/msm_gem.c
> index 65f35544c1ec..065d933df2c3 100644
> --- a/drivers/gpu/drm/msm/msm_gem.c
> +++ b/drivers/gpu/drm/msm/msm_gem.c
> @@ -383,8 +383,10 @@ int msm_gem_get_iova(struct drm_gem_object *obj,
> struct page **pages;
>
> vma = add_vma(obj, aspace);
> - if (IS_ERR(vma))
> - return PTR_ERR(vma);
> + if (IS_ERR(vma)) {
> + ret = PTR_ERR(vma);
> + goto unlock;
> + }
>
> pages = get_pages(obj);
> if (IS_ERR(pages)) {
> @@ -405,7 +407,7 @@ int msm_gem_get_iova(struct drm_gem_object *obj,
>
> fail:
> del_vma(vma);
> -
> +unlock:
> mutex_unlock(&msm_obj->lock);
> return ret;
> }