Skip to contentSkip to conversation

drm/simple_kms_helper: Fix NULL pointer dereference with no active CRTC

PATCH In review Oleksandr Andrushchenko 3 participants 4 messages Feb 22, 2018

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

PATCH 1/1 drm/simple_kms_helper: Fix NULL pointer dereference with no active CRTC

From: Oleksandr Andrushchenko <[email protected]>

It is possible that drm_simple_kms_plane_atomic_check called with no CRTC set, e.g. when user-space application sets CRTC_ID/FB_ID to 0 before doing any actual drawing. This leads to NULL pointer dereference because in this case new CRTC state is NULL and must be checked before accessing.

---
Changes since initial:
- re-worked checks for null CRTC as suggested by Daniel Vetter

---
 drivers/gpu/drm/drm_simple_kms_helper.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_simple_kms_helper.c +3 -7
index 9ca8a4a59b74..4a1dbd88b1ec 100644
@@ -121,12 +121,6 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
 	pipe = container_of(plane, struct drm_simple_display_pipe, plane);
 	crtc_state = drm_atomic_get_new_crtc_state(plane_state->state,
 						   &pipe->crtc);
-	if (!crtc_state->enable)
-		return 0; /* nothing to check when disabling or disabled */
-
-	if (crtc_state->enable)
-		drm_mode_get_hv_timing(&crtc_state->mode,
-				       &clip.x2, &clip.y2);
 
 	ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state,
 						  &clip,
@@ -137,7 +131,9 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
 		return ret;
 
 	if (!plane_state->visible)
-		return -EINVAL;
+		return 0;
+
+	drm_mode_get_hv_timing(&crtc_state->mode, &clip.x2, &clip.y2);
 
 	if (!pipe->funcs || !pipe->funcs->check)
 		return 0;
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw
Quoted 36 lines · Oleksandr Andrushchenko

From: Oleksandr Andrushchenko <[email protected]>

It is possible that drm_simple_kms_plane_atomic_check called with no CRTC set, e.g. when user-space application sets CRTC_ID/FB_ID to 0 before doing any actual drawing. This leads to NULL pointer dereference because in this case new CRTC state is NULL and must be checked before accessing.

---
Changes since initial:
- re-worked checks for null CRTC as suggested by Daniel Vetter

---
  drivers/gpu/drm/drm_simple_kms_helper.c | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_simple_kms_helper.c +0 -6
index 9ca8a4a59b74..4a1dbd88b1ec 100644
@@ -121,12 +121,6 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
  	pipe = container_of(plane, struct drm_simple_display_pipe, plane);
  	crtc_state = drm_atomic_get_new_crtc_state(plane_state->state,
  						   &pipe->crtc);
-	if (!crtc_state->enable)
-		return 0; /* nothing to check when disabling or disabled */
-
-	if (crtc_state->enable)
-		drm_mode_get_hv_timing(&crtc_state->mode,
-				       &clip.x2, &clip.y2);
 
  	ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state,
  						  &clip,

drivers/gpu/drm/drm_simple_kms_helper.c static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane, · line 140

Quoted 4 lines
drivers/gpu/drm/drm_simple_kms_helper.c +0 -1
@@ -137,7 +131,9 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
  		return ret;
 
  	if (!plane_state->visible)
-		return -EINVAL;

Daniel, I have put your R-b tag, but I had removed suggested "WARN_ON(crtc_state && crtc_state->enable);"
here as it fires each time when crtc_state is not NULL. Please let me know if this is not ok and you want me to remove your R-b tag.

drivers/gpu/drm/drm_simple_kms_helper.c static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane, · line 139

Quoted 6 lines
drivers/gpu/drm/drm_simple_kms_helper.c +3 -0
+		return 0;
+
+	drm_mode_get_hv_timing(&crtc_state->mode, &clip.x2, &clip.y2);
 
  	if (!pipe->funcs || !pipe->funcs->check)
  		return 0;

Thank you,
Oleksandr
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 36 lines · Oleksandr Andrushchenko
Quoted 35 lines · Oleksandr Andrushchenko

From: Oleksandr Andrushchenko <[email protected]>

It is possible that drm_simple_kms_plane_atomic_check called with no CRTC set, e.g. when user-space application sets CRTC_ID/FB_ID to 0 before doing any actual drawing. This leads to NULL pointer dereference because in this case new CRTC state is NULL and must be checked before accessing.

---
Changes since initial:
- re-worked checks for null CRTC as suggested by Daniel Vetter

---
  drivers/gpu/drm/drm_simple_kms_helper.c | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_simple_kms_helper.c +0 -6
index 9ca8a4a59b74..4a1dbd88b1ec 100644
@@ -121,12 +121,6 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
  	pipe = container_of(plane, struct drm_simple_display_pipe, plane);
  	crtc_state = drm_atomic_get_new_crtc_state(plane_state->state,
  						   &pipe->crtc);
-	if (!crtc_state->enable)
-		return 0; /* nothing to check when disabling or disabled */
-
-	if (crtc_state->enable)
-		drm_mode_get_hv_timing(&crtc_state->mode,
-				       &clip.x2, &clip.y2);
  	ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state,
  						  &clip,
@@ -137,7 +131,9 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
Quoted 8 lines

drivers/gpu/drm/drm_simple_kms_helper.c static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane, · line 140

Quoted 3 lines
drivers/gpu/drm/drm_simple_kms_helper.c +0 -1
  		return ret;
  	if (!plane_state->visible)
-		return -EINVAL;

Daniel, I have put your R-b tag, but I had removed suggested "WARN_ON(crtc_state && crtc_state->enable);"
here as it fires each time when crtc_state is not NULL. Please let me know if this is not ok and you want me to remove your R-b tag.

I'm a bit confused why that fires, but oh well. Applied, thanks for your patch.
-Daniel

Quoted 11 lines

drivers/gpu/drm/drm_simple_kms_helper.c static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane, · line 139

Quoted 5 lines
drivers/gpu/drm/drm_simple_kms_helper.c +3 -0
+		return 0;
+
+	drm_mode_get_hv_timing(&crtc_state->mode, &clip.x2, &clip.y2);
  	if (!pipe->funcs || !pipe->funcs->check)
  		return 0;

Thank you,
Oleksandr
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw
Quoted 45 lines · Daniel Vetter
Quoted 36 lines · Oleksandr Andrushchenko
Quoted 35 lines · Oleksandr Andrushchenko

From: Oleksandr Andrushchenko <[email protected]>

It is possible that drm_simple_kms_plane_atomic_check called with no CRTC set, e.g. when user-space application sets CRTC_ID/FB_ID to 0 before doing any actual drawing. This leads to NULL pointer dereference because in this case new CRTC state is NULL and must be checked before accessing.

---
Changes since initial:
- re-worked checks for null CRTC as suggested by Daniel Vetter

---
   drivers/gpu/drm/drm_simple_kms_helper.c | 10 +++-------
   1 file changed, 3 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_simple_kms_helper.c +0 -6
index 9ca8a4a59b74..4a1dbd88b1ec 100644
@@ -121,12 +121,6 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
   	pipe = container_of(plane, struct drm_simple_display_pipe, plane);
   	crtc_state = drm_atomic_get_new_crtc_state(plane_state->state,
   						   &pipe->crtc);
-	if (!crtc_state->enable)
-		return 0; /* nothing to check when disabling or disabled */
-
-	if (crtc_state->enable)
-		drm_mode_get_hv_timing(&crtc_state->mode,
-				       &clip.x2, &clip.y2);
   	ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state,
   						  &clip,
@@ -137,7 +131,9 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
Quoted 8 lines

drivers/gpu/drm/drm_simple_kms_helper.c static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane, · line 140

Quoted 3 lines
drivers/gpu/drm/drm_simple_kms_helper.c +0 -1
   		return ret;
   	if (!plane_state->visible)
-		return -EINVAL;

Daniel, I have put your R-b tag, but I had removed suggested "WARN_ON(crtc_state && crtc_state->enable);"
here as it fires each time when crtc_state is not NULL. Please let me know if this is not ok and you want me to remove your R-b tag.

Quoted 2 lines

I'm a bit confused why that fires, but oh well. Applied, thanks for your patch.

Thank you

Quoted 13 lines

-Daniel

Quoted 11 lines

drivers/gpu/drm/drm_simple_kms_helper.c static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane, · line 139

Quoted 5 lines
drivers/gpu/drm/drm_simple_kms_helper.c +3 -0
+		return 0;
+
+	drm_mode_get_hv_timing(&crtc_state->mode, &clip.x2, &clip.y2);
   	if (!pipe->funcs || !pipe->funcs->check)
   		return 0;

Thank you,
Oleksandr
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel