Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e2842fb authored by Tuo Li's avatar Tuo Li Committed by Greg Kroah-Hartman
Browse files

drm/display: fix possible null-pointer dereference in dcn10_set_clock() 



[ Upstream commit 554594567b1fa3da74f88ec7b2dc83d000c58e98 ]

The variable dc->clk_mgr is checked in:
  if (dc->clk_mgr && dc->clk_mgr->funcs->get_clock)

This indicates dc->clk_mgr can be NULL.
However, it is dereferenced in:
    if (!dc->clk_mgr->funcs->get_clock)

To fix this null-pointer dereference, check dc->clk_mgr and the function
pointer dc->clk_mgr->funcs->get_clock earlier, and return if one of them
is NULL.

Reported-by: default avatarTOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: default avatarTuo Li <islituo@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cf82fe45

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

+5 −6
Original line number Diff line number Diff line
@@ -3264,13 +3264,12 @@ static enum dc_status dcn10_set_clock(struct dc *dc, 
	struct dc_clock_config clock_cfg = {0};

	struct dc_clocks *current_clocks = &context->bw_ctx.bw.dcn.clk;



	if (dc->clk_mgr && dc->clk_mgr->funcs->get_clock)

	if (!dc->clk_mgr || !dc->clk_mgr->funcs->get_clock)

		return DC_FAIL_UNSUPPORTED_1;



	dc->clk_mgr->funcs->get_clock(dc->clk_mgr,

		context, clock_type, &clock_cfg);



	if (!dc->clk_mgr->funcs->get_clock)

		return DC_FAIL_UNSUPPORTED_1;



	if (clk_khz > clock_cfg.max_clock_khz)

		return DC_FAIL_CLK_EXCEED_MAX;
@@ -3288,7 +3287,7 @@ static enum dc_status dcn10_set_clock(struct dc *dc, 
	else

		return DC_ERROR_UNEXPECTED;



	if (dc->clk_mgr && dc->clk_mgr->funcs->update_clocks)

	if (dc->clk_mgr->funcs->update_clocks)

				dc->clk_mgr->funcs->update_clocks(dc->clk_mgr,

				context, true);

	return DC_OK;