* [PATCH] drm/msm: unlock on error in msm_gem_get_iova()
@ 2017-07-10 7:20 Dan Carpenter
2017-07-10 17:51 ` Sushmita Susheelendra
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2017-07-10 7:20 UTC (permalink / raw)
To: Rob Clark, Sushmita Susheelendra
Cc: David Airlie, linux-arm-msm, dri-devel, freedreno,
kernel-janitors
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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] drm/msm: unlock on error in msm_gem_get_iova()
2017-07-10 7:20 [PATCH] drm/msm: unlock on error in msm_gem_get_iova() Dan Carpenter
@ 2017-07-10 17:51 ` Sushmita Susheelendra
0 siblings, 0 replies; 2+ messages in thread
From: Sushmita Susheelendra @ 2017-07-10 17:51 UTC (permalink / raw)
To: Dan Carpenter
Cc: Rob Clark, David Airlie, linux-arm-msm, dri-devel, freedreno,
kernel-janitors
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;
> }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-10 17:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-10 7:20 [PATCH] drm/msm: unlock on error in msm_gem_get_iova() Dan Carpenter
2017-07-10 17:51 ` Sushmita Susheelendra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox