Skip to contentSkip to conversation

drm/msm/dp: Fix double free on error in msm_dp_bridge_init()

PATCH In review Dan Carpenter 2 participants 2 messages Dec 15, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/msm/dp: Fix double free on error in msm_dp_bridge_init()

The "dp_bridge" pointer is allocated with devm_kzalloc() so it will be freed automatically. Kfreeing it here will only lead to a double free.

Fixes 8a3b4c17f863 ("drm/msm/dp: employ bridge mechanism for display enable and disable")
---
 drivers/gpu/drm/msm/dp/dp_drm.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/msm/dp/dp_drm.c +0 -1
index 188e77c59885..d4d360d19eba 100644
@@ -243,7 +243,6 @@ struct drm_bridge *msm_dp_bridge_init(struct msm_dp *dp_display, struct drm_devi
 	rc = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
 	if (rc) {
 		DRM_ERROR("failed to attach bridge, rc=%d\n", rc);
-		kfree(dp_bridge);
 		return ERR_PTR(rc);
 	}
 
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Dan Carpenter

The "dp_bridge" pointer is allocated with devm_kzalloc() so it will be freed automatically. Kfreeing it here will only lead to a double free.

Fixes 8a3b4c17f863 ("drm/msm/dp: employ bridge mechanism for display enable and disable")
Quoted 17 lines
---
  drivers/gpu/drm/msm/dp/dp_drm.c | 1 -
  1 file changed, 1 deletion(-)
drivers/gpu/drm/msm/dp/dp_drm.c +0 -1
index 188e77c59885..d4d360d19eba 100644
@@ -243,7 +243,6 @@ struct drm_bridge *msm_dp_bridge_init(struct msm_dp *dp_display, struct drm_devi
  	rc = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
  	if (rc) {
  		DRM_ERROR("failed to attach bridge, rc=%d\n", rc);
-		kfree(dp_bridge);
  		return ERR_PTR(rc);
  	}
 
Signature · 2 lines
With best wishes
Dmitry