diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2017-07-10 10:20:42 +0300 |
|---|---|---|
| committer |   Rob Clark <robdclark@gmail.com> | 2017-08-01 16:24:21 -0400 |
| commit | 71e3dfa167b105d3c06e76fee1d0e2fd1e502cf6 (patch) | |
| tree | c0e7f566aeeebed7690ff08582a6b7466ba5f166 /drivers/gpu | |
| parent | drm/msm: fix an integer overflow test (diff) | |
| download | linux-dev-71e3dfa167b105d3c06e76fee1d0e2fd1e502cf6.tar.xz linux-dev-71e3dfa167b105d3c06e76fee1d0e2fd1e502cf6.zip | |
drm/msm: unlock on error in msm_gem_get_iova()
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>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 8 |
1 files changed, 5 insertions, 3 deletions
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; } |