Commit e69f0b98 authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Baogen Shang
Browse files

drm/amd/display: Fix potential NULL pointer dereferences in 'dcn10_set_output_transfer_func()' 

stable inclusion
from stable-v5.10.214
commit 330caa061af53ea6d287d7c43d0703714e510e08
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9J6AL
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.10.y&id=330caa061af53ea6d287d7c43d0703714e510e08



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

[ Upstream commit 9ccfe80d022df7c595f1925afb31de2232900656 ]

The 'stream' pointer is used in dcn10_set_output_transfer_func() before
the check if 'stream' is NULL.

Fixes the below:
drivers/gpu/drm/amd/amdgpu/../display/dc/hwss/dcn10/dcn10_hwseq.c:1892 dcn10_set_output_transfer_func() warn: variable dereferenced before check 'stream' (see line 1875)

Fixes: ddef02de ("drm/amd/display: add null checks before logging")
Cc: Wyatt Wood <wyatt.wood@amd.com>
Cc: Anthony Koo <Anthony.Koo@amd.com>
Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Cc: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarBaogen Shang <baogen.shang@windriver.com>
parent 34c4be6c

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+5 −2
Original line number Diff line number Diff line
@@ -1669,6 +1669,9 @@ bool dcn10_set_output_transfer_func(struct dc *dc, struct pipe_ctx *pipe_ctx, 
{

	struct dpp *dpp = pipe_ctx->plane_res.dpp;



	if (!stream)

		return false;



	if (dpp == NULL)

		return false;
@@ -1691,8 +1694,8 @@ bool dcn10_set_output_transfer_func(struct dc *dc, struct pipe_ctx *pipe_ctx, 
	} else

		dpp->funcs->dpp_program_regamma_pwl(dpp, NULL, OPP_REGAMMA_BYPASS);



	if (stream != NULL && stream->ctx != NULL &&

			stream->out_transfer_func != NULL) {

	if (stream->ctx &&

	    stream->out_transfer_func) {

		log_tf(stream->ctx,

				stream->out_transfer_func,

				dpp->regamma_params.hw_points_num);