Skip to contentSkip to conversation

drm/komeda: Potential error pointer dereference

PATCH In review Dan Carpenter 3 participants 4 messages May 3, 2019 – May 20, 2019

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

PATCH 1/1 drm/komeda: Potential error pointer dereference

We need to check whether drm_atomic_get_crtc_state() returns an error pointer before dereferencing "crtc_st".

Fixes 7d31b9e7a550 ("drm/komeda: Add komeda_plane/plane_helper_funcs")
---
 drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/arm/display/komeda/komeda_plane.c +1 -1
index 07ed0cc1bc44..c7e5fc6e5500 100644
@@ -64,7 +64,7 @@ komeda_plane_atomic_check(struct drm_plane *plane,
 		return 0;
 
 	crtc_st = drm_atomic_get_crtc_state(state->state, state->crtc);
-	if (!crtc_st->enable) {
+	if (IS_ERR(crtc_st) || !crtc_st->enable) {
 		DRM_DEBUG_ATOMIC("Cannot update plane on a disabled CRTC.\n");
 		return -EINVAL;
 	}
Signature · 1 line
2.18.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Dan Carpenter

We need to check whether drm_atomic_get_crtc_state() returns an error pointer before dereferencing "crtc_st".

Fixes 7d31b9e7a550 ("drm/komeda: Add komeda_plane/plane_helper_funcs")

I'll pull this and send it as a fix after -rc1.

Best regards,
Liviu

Quoted 20 lines
---
 drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/arm/display/komeda/komeda_plane.c +1 -1
index 07ed0cc1bc44..c7e5fc6e5500 100644
@@ -64,7 +64,7 @@ komeda_plane_atomic_check(struct drm_plane *plane,
 		return 0;
 
 	crtc_st = drm_atomic_get_crtc_state(state->state, state->crtc);
-	if (!crtc_st->enable) {
+	if (IS_ERR(crtc_st) || !crtc_st->enable) {
 		DRM_DEBUG_ATOMIC("Cannot update plane on a disabled CRTC.\n");
 		return -EINVAL;
 	}
Signature · 1 line
2.18.0
Signature · 8 lines
==========
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯
#2 lore raw
In reply to Dan Carpenter

Hi Dan

Quoted 15 lines · Dan Carpenter

We need to check whether drm_atomic_get_crtc_state() returns an error pointer before dereferencing "crtc_st".

Fixes 7d31b9e7a550 ("drm/komeda: Add komeda_plane/plane_helper_funcs")
---
 drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/arm/display/komeda/komeda_plane.c +0 -0
index 07ed0cc1bc44..c7e5fc6e5500 100644

drivers/gpu/drm/arm/display/komeda/komeda_plane.c komeda_plane_atomic_check(struct drm_plane *plane, · line 70

Quoted 8 lines
drivers/gpu/drm/arm/display/komeda/komeda_plane.c +1 -1
@@ -64,7 +64,7 @@ komeda_plane_atomic_check(struct drm_plane *plane,
 		return 0;
 
 	crtc_st = drm_atomic_get_crtc_state(state->state, state->crtc);
-	if (!crtc_st->enable) {
+	if (IS_ERR(crtc_st) || !crtc_st->enable) {
 		DRM_DEBUG_ATOMIC("Cannot update plane on a disabled CRTC.\n");
 		return -EINVAL;
 	}

Thank you for the fixing.

Signature · 1 line
Reviewed-by: James Qian Wang (Arm Technology China) <[email protected]>
#3 lore raw
In reply to Dan Carpenter
Quoted 15 lines · Dan Carpenter

We need to check whether drm_atomic_get_crtc_state() returns an error pointer before dereferencing "crtc_st".

Fixes 7d31b9e7a550 ("drm/komeda: Add komeda_plane/plane_helper_funcs")
---
 drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/arm/display/komeda/komeda_plane.c +0 -0
index 07ed0cc1bc44..c7e5fc6e5500 100644

drivers/gpu/drm/arm/display/komeda/komeda_plane.c komeda_plane_atomic_check(struct drm_plane *plane, · line 70

Quoted 8 lines
drivers/gpu/drm/arm/display/komeda/komeda_plane.c +1 -1
@@ -64,7 +64,7 @@ komeda_plane_atomic_check(struct drm_plane *plane,
 		return 0;
 
 	crtc_st = drm_atomic_get_crtc_state(state->state, state->crtc);
-	if (!crtc_st->enable) {
+	if (IS_ERR(crtc_st) || !crtc_st->enable) {
 		DRM_DEBUG_ATOMIC("Cannot update plane on a disabled CRTC.\n");
 		return -EINVAL;
 	}

Thank you for the fixing.