Commit 7dbf7f81 authored by Alex Hung's avatar Alex Hung Committed by Kaixiong Yu
Browse files

drm/amd/display: Check phantom_stream before it is used 

mainline inclusion
from mainline-v6.12-rc1
commit 3718a619a8c0a53152e76bb6769b6c414e1e83f4
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYRC5
CVE: CVE-2024-49897

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3718a619a8c0a53152e76bb6769b6c414e1e83f4



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

dcn32_enable_phantom_stream can return null, so returned value
must be checked before used.

This fixes 1 NULL_RETURNS issue reported by Coverity.

Reviewed-by: default avatarRodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: default avatarJerry Zuo <jerry.zuo@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>

Conflicts:
	drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
	drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c
[Ma Wupeng: related function is moved to another file]
Signed-off-by: default avatarMa Wupeng <mawupeng1@huawei.com>
parent 9809e40d

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c

+3 −0
Original line number Diff line number Diff line
@@ -1791,6 +1791,9 @@ void dcn32_add_phantom_pipes(struct dc *dc, struct dc_state *context, 
	// be a valid candidate for SubVP (i.e. has a plane, stream, doesn't

	// already have phantom pipe assigned, etc.) by previous checks.

	phantom_stream = dcn32_enable_phantom_stream(dc, context, pipes, pipe_cnt, index);

	if (!phantom_stream)

		return;



	dcn32_enable_phantom_plane(dc, context, phantom_stream, index);



	for (i = 0; i < dc->res_pool->pipe_count; i++) {