From: Nicholas Kazlauskas <[email protected]>

[Why]

A null pointer deference can occur if crtc is null in
amdgpu_dm_crtc_handle_crc_irq. This can happen if get_crtc_by_otg_inst
returns NULL during dm_crtc_high_irq, leading to a hang in some IGT
test cases.

[How]

Check that CRTC is non-null before accessing its fields.

Change-Id: I00f539ca66b1da4e9c42e4a2f74eb1a8d723be94
Signed-off-by: Nicholas Kazlauskas <[email protected]>
Reviewed-by: Sun peng Li <[email protected]>
Acked-by: Leo Li <[email protected]>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
index 52f2c01..9bfb040 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
@@ -98,10 +98,16 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, 
const char *src_name,
  */
 void amdgpu_dm_crtc_handle_crc_irq(struct drm_crtc *crtc)
 {
-       struct dm_crtc_state *crtc_state = to_dm_crtc_state(crtc->state);
-       struct dc_stream_state *stream_state = crtc_state->stream;
+       struct dm_crtc_state *crtc_state;
+       struct dc_stream_state *stream_state;
        uint32_t crcs[3];
 
+       if (crtc == NULL)
+               return;
+
+       crtc_state = to_dm_crtc_state(crtc->state);
+       stream_state = crtc_state->stream;
+
        /* Early return if CRC capture is not enabled. */
        if (!crtc_state->crc_enabled)
                return;
-- 
2.7.4

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

Reply via email to