Commit c2f5e112 authored by Alex Hung's avatar Alex Hung Committed by Tong Tiangen
Browse files

drm/amd/display: Add null checker before passing variables 

stable inclusion
from stable-v5.15.165
commit d0b8b23b9c2ebec693a36fea518d8f13493ad655
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAMMTJ
CVE: CVE-2024-43902

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d0b8b23b9c2ebec693a36fea518d8f13493ad655



--------------------------------

[ Upstream commit 8092aa3ab8f7b737a34b71f91492c676a843043a ]

Checks null pointer before passing variables to functions.

This fixes 3 NULL_RETURNS issues reported by Coverity.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Acked-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>

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

Signed-off-by: default avatarTong Tiangen <tongtiangen@huawei.com>
parent 02994a9b

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

+6 −3
Original line number Diff line number Diff line
@@ -1779,6 +1779,7 @@ static int dm_suspend(void *handle) 
		mutex_lock(&dm->dc_lock);

		dm->cached_dc_state = dc_copy_state(dm->dc->current_state);



		if (dm->cached_dc_state)

			dm_gpureset_toggle_interrupts(adev, dm->cached_dc_state, false);



		amdgpu_dm_commit_zero_streams(dm->dc);
@@ -5345,6 +5346,7 @@ static void create_eml_sink(struct amdgpu_dm_connector *aconnector) 
		aconnector->dc_sink = aconnector->dc_link->local_sink ?

		aconnector->dc_link->local_sink :

		aconnector->dc_em_sink;

		if (aconnector->dc_sink)

			dc_sink_retain(aconnector->dc_sink);

	}

}
@@ -6485,6 +6487,7 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector) 
				drm_add_modes_noedid(connector, 640, 480);

	} else {

		amdgpu_dm_connector_ddc_get_modes(connector, edid);

		if (encoder)

			amdgpu_dm_connector_add_common_modes(encoder, connector);

	}

	amdgpu_dm_fbc_init(connector);