Commit 07b93a57 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd/display: Avoid a NULL pointer dereference 



[WHY]
Although unlikely drm_atomic_get_new_connector_state() or
drm_atomic_get_old_connector_state() can return NULL.

[HOW]
Check returns before dereference.

Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Tested-by: default avatarDan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 1e5e8d67)
Cc: stable@vger.kernel.org
parent 79e25cd0

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+3 −0
Original line number Diff line number Diff line
@@ -7792,6 +7792,9 @@ amdgpu_dm_connector_atomic_check(struct drm_connector *conn, 
	struct amdgpu_dm_connector *aconn = to_amdgpu_dm_connector(conn);

	int ret;



	if (WARN_ON(unlikely(!old_con_state || !new_con_state)))

		return -EINVAL;



	trace_amdgpu_dm_connector_atomic_check(new_con_state);



	if (conn->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {