]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm: msm: fix possible memory leak in mdp5_crtc_cursor_set()
authorHangyu Hua <hbh25y@gmail.com>
Mon, 9 May 2022 06:11:25 +0000 (14:11 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jun 2022 14:59:23 +0000 (16:59 +0200)
[ Upstream commit 947a844bb3ebff0f4736d244d792ce129f6700d7 ]

drm_gem_object_lookup will call drm_gem_object_get inside. So cursor_bo
needs to be put when msm_gem_get_and_pin_iova fails.

Fixes: e172d10a9c4a ("drm/msm/mdp5: Add hardware cursor support")
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
Link: https://lore.kernel.org/r/20220509061125.18585-1-hbh25y@gmail.com
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c

index 76639a108ff5f6fff7eb8b238f973f1108214bd1..b8a01c95b831f386f0169ab21b8b5a5d927a6e8a 100644 (file)
@@ -911,8 +911,10 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,
 
        ret = msm_gem_get_iova(cursor_bo, kms->aspace,
                        &mdp5_crtc->cursor.iova);
-       if (ret)
+       if (ret) {
+               drm_gem_object_put(cursor_bo);
                return -EINVAL;
+       }
 
        pm_runtime_get_sync(&pdev->dev);