[PATCH v2] drm/amd/display: Add NULL check for clk_mgr in dcn32_init_hw
Alex Hung
alex.hung at amd.com
Tue Jul 23 03:01:42 UTC 2024
Reviewed-by: Alex Hung <alex.hung at amd.com>
On 2024-07-22 05:14, Srinivasan Shanmugam wrote:
> This commit addresses a potential null pointer dereference issue in the
> `dcn32_init_hw` function. The issue could occur when `dc->clk_mgr` is
> null.
>
> The fix adds a check to ensure `dc->clk_mgr` is not null before
> accessing its functions. This prevents a potential null pointer
> dereference.
>
> Reported by smatch:
> drivers/gpu/drm/amd/amdgpu/../display/dc/hwss/dcn32/dcn32_hwseq.c:961 dcn32_init_hw() error: we previously assumed 'dc->clk_mgr' could be null (see line 782)
>
> Cc: Tom Chung <chiahsuan.chung at amd.com>
> Cc: Rodrigo Siqueira <Rodrigo.Siqueira at amd.com>
> Cc: Roman Li <roman.li at amd.com>
> Cc: Alex Hung <alex.hung at amd.com>
> Cc: Aurabindo Pillai <aurabindo.pillai at amd.com>
> Cc: Harry Wentland <harry.wentland at amd.com>
> Cc: Hamza Mahfooz <hamza.mahfooz at amd.com>
> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam at amd.com>
> ---
> v2: Along with "dc->clk_mgr" add check for even dc->clk_mgr->funcs" (Tom)
>
> drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c
> index a7cb003f1dfb..fcaabad204a2 100644
> --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c
> +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c
> @@ -779,7 +779,7 @@ void dcn32_init_hw(struct dc *dc)
> uint32_t backlight = MAX_BACKLIGHT_LEVEL;
> uint32_t user_level = MAX_BACKLIGHT_LEVEL;
>
> - if (dc->clk_mgr && dc->clk_mgr->funcs->init_clocks)
> + if (dc->clk_mgr && dc->clk_mgr->funcs && dc->clk_mgr->funcs->init_clocks)
> dc->clk_mgr->funcs->init_clocks(dc->clk_mgr);
>
> // Initialize the dccg
> @@ -958,10 +958,11 @@ void dcn32_init_hw(struct dc *dc)
> if (!dcb->funcs->is_accelerated_mode(dcb) && dc->res_pool->hubbub->funcs->init_watermarks)
> dc->res_pool->hubbub->funcs->init_watermarks(dc->res_pool->hubbub);
>
> - if (dc->clk_mgr->funcs->notify_wm_ranges)
> + if (dc->clk_mgr && dc->clk_mgr->funcs && dc->clk_mgr->funcs->notify_wm_ranges)
> dc->clk_mgr->funcs->notify_wm_ranges(dc->clk_mgr);
>
> - if (dc->clk_mgr->funcs->set_hard_max_memclk && !dc->clk_mgr->dc_mode_softmax_enabled)
> + if (dc->clk_mgr && dc->clk_mgr->funcs && dc->clk_mgr->funcs->set_hard_max_memclk &&
> + !dc->clk_mgr->dc_mode_softmax_enabled)
> dc->clk_mgr->funcs->set_hard_max_memclk(dc->clk_mgr);
>
> if (dc->res_pool->hubbub->funcs->force_pstate_change_control)
More information about the amd-gfx
mailing list