diff options
| author |   Jordan Crouse <jcrouse@codeaurora.org> | 2018-11-02 09:25:19 -0600 |
|---|---|---|
| committer |   Rob Clark <robdclark@gmail.com> | 2018-12-11 13:05:28 -0500 |
| commit | 93f7abf19dad2d0ad3c93597c87bbaff03218cb9 (patch) | |
| tree | 797718d3a1a437e6898d65d18078fe9fafef3b44 /drivers/gpu/drm/msm/msm_gem.c | |
| parent | drm/msm/gpu: Allocate the correct size for the GPU memptrs (diff) | |
| download | linux-dev-93f7abf19dad2d0ad3c93597c87bbaff03218cb9.tar.xz linux-dev-93f7abf19dad2d0ad3c93597c87bbaff03218cb9.zip | |
drm/msm: Gracefully handle failure in _msm_gem_kernel_new
If any of the function calls in _msm_gem_kernel_new fail we need
to make sure to dereference the GEM object with the appropriate
function for the current locking state.
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 00c795ced02c..4646e9e45fc2 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -1041,23 +1041,29 @@ static void *_msm_gem_kernel_new(struct drm_device *dev, uint32_t size, if (iova) { ret = msm_gem_get_iova(obj, aspace, iova); - if (ret) { - drm_gem_object_put(obj); - return ERR_PTR(ret); - } + if (ret) + goto err; } vaddr = msm_gem_get_vaddr(obj); if (IS_ERR(vaddr)) { msm_gem_put_iova(obj, aspace); - drm_gem_object_put(obj); - return ERR_CAST(vaddr); + ret = PTR_ERR(vaddr); + goto err; } if (bo) *bo = obj; return vaddr; +err: + if (locked) + drm_gem_object_put(obj); + else + drm_gem_object_put_unlocked(obj); + + return ERR_PTR(ret); + } void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size, |