Bail from drmmode_cm_init if there's no CRTC

Submitted by Michel Dänzer on Sept. 13, 2018, 9:47 a.m.

Details

Message ID 20180913094729.2355-1-michel@daenzer.net
State Accepted
Commit 6572be49b713a26eca14f16e1854cabf28101288
Headers show
Series "Bail from drmmode_cm_init if there's no CRTC" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Michel Dänzer Sept. 13, 2018, 9:47 a.m. 
From: Michel Dänzer <michel.daenzer@amd.com>

We would crash due to dereferencing the NULL mode_res->crtc pointer.

Bugzilla: https://bugs.freedesktop.org/107913
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
---
 src/drmmode_display.c | 3 +++
 1 file changed, 3 insertions(+)

Patch hide | download patch | download mbox 

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 6ef6a98e2..cbda8ad35 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -3198,6 +3198,9 @@  static void drmmode_cm_init(int drm_fd, drmmode_ptr drmmode,
 	memset(drmmode->cm_prop_ids, 0, sizeof(drmmode->cm_prop_ids));
 	drmmode->gamma_lut_size = drmmode->degamma_lut_size = 0;
 
+	if (!mode_res->crtcs)
+		return;
+
 	/* AMD hardware has color management support on all pipes. It is
 	 * therefore sufficient to only check the first CRTC.
 	 */