Skip to contentSkip to conversation

drm: msm: fix possible memory leak in mdp5_crtc_cursor_set()

PATCH In review Hangyu Hua 1 participant 2 messages May 9, 2022 – May 23, 2022

Subsystems (3)
lore
Share & tools
lore

Hangyu Hua

author
#0 lore raw

PATCH 1/1 drm: msm: fix possible memory leak in mdp5_crtc_cursor_set()

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")
---
 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +3 -1
index b966cd69f99d..6a5f73f6a23b 100644
@@ -991,8 +991,10 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,
 
 	ret = msm_gem_get_and_pin_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);
 
Signature · 1 line
2.25.1
author
#1 lore raw
Quoted 15 lines · Hangyu Hua

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")
---
  drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +0 -0
index b966cd69f99d..6a5f73f6a23b 100644
@@ -991,8 +991,10 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,
 

drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c static int mdp5_crtc_cursor_set(struct drm_crtc *crtc, · line 1000

Quoted 10 lines
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +3 -1
  	ret = msm_gem_get_and_pin_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);
 

Gentel ping.