drm/display: fix possible null-pointer dereference in dcn10_set_clock()
Subsystems (3)
PATCH 1/1 drm/display: fix possible null-pointer dereference in dcn10_set_clock()
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 possible null-pointer dereference, check dc->clk_mgr before dereferencing it.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +1 -1
@@ -3635,7 +3635,7 @@ enum dc_status dcn10_set_clock(struct dc *dc, dc->clk_mgr->funcs->get_clock (dc->clk_mgr, context, clock_type, &clock_cfg); -if (!dc->clk_mgr->funcs->get_clock) +if (dc->clk_mgr && !dc->clk_mgr->funcs->get_clock)return DC_FAIL_UNSUPPORTED_1 ;if (clk_khz > clock_cfg.max_clock_khz)
Signature · 1 line
2.25.1
[Public]
Thanks for your patch.
I suggest moving the check of function pointer dc->clk_mgr->funcs->get_clock earlier, and return early if it's NULL, as if it's NULL, it's meaningless to continue the clock setting.
....
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);
....
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Tuo Li
Sent: Tuesday, August 10, 2021 5:20 PM
To: Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; [email protected]; [email protected]; Cyr, Aric <[email protected]>; Lei, Jun <[email protected]>; Zhuo, Qingqing <[email protected]>; Siqueira, Rodrigo <[email protected]>; Lee, Alvin <[email protected]>; Stempen, Vladimir <[email protected]>; [email protected]; Lee, Sung <[email protected]>; Po-Yu Hsieh Paul <[email protected]>; Wood, Wyatt <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Tuo Li <[email protected]>; TOTE Robot <[email protected]>
Subject: [PATCH] drm/display: fix possible null-pointer dereference in dcn10_set_clock()
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 possible null-pointer dereference, check dc->clk_mgr before dereferencing it.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +1 -1
@@ -3635,7 +3635,7 @@ enum dc_status dcn10_set_clock(struct dc *dc, dc->clk_mgr->funcs->get_clock (dc->clk_mgr, context, clock_type, &clock_cfg); -if (!dc->clk_mgr->funcs->get_clock) +if (dc->clk_mgr && !dc->clk_mgr->funcs->get_clock)return DC_FAIL_UNSUPPORTED_1 ;if (clk_khz > clock_cfg.max_clock_khz)
--
2.25.1
Thanks for your feedback. We will prepare a V2 patch according to your advice.
Best wishes,
Tuo Li
Quoted 54 lines · Guchun
[Public]
Thanks for your patch.
I suggest moving the check of function pointer
dc->clk_mgr->funcs->get_clockearlier, and return early if it's NULL, as if it's NULL, it's meaningless to continue the clock setting.....
if (!dc->clk_mgr || !dc->clk_mgr->funcs->get_clock)
returnDC_FAIL_UNSUPPORTED_1;dc->clk_mgr->funcs->get_clock(dc->clk_mgr,
context,clock_type,&clock_cfg);
....Regards,
Guchun-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Tuo Li
Sent: Tuesday, August 10, 2021 5:20 PM
To: Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; [email protected]; [email protected]; Cyr, Aric <[email protected]>; Lei, Jun <[email protected]>; Zhuo, Qingqing <[email protected]>; Siqueira, Rodrigo <[email protected]>; Lee, Alvin <[email protected]>; Stempen, Vladimir <[email protected]>; [email protected]; Lee, Sung <[email protected]>; Po-Yu Hsieh Paul <[email protected]>; Wood, Wyatt <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Tuo Li <[email protected]>; TOTE Robot <[email protected]>
Subject: [PATCH] drm/display: fix possible null-pointer dereference indcn10_set_clock()The variable
dc->clk_mgris checked in:if (dc->clk_mgr && dc->clk_mgr->funcs->get_clock)This indicates
dc->clk_mgrcan be NULL.
However, it is dereferenced in:if (!dc->clk_mgr->funcs->get_clock)To fix this possible null-pointer dereference, check
dc->clk_mgrbefore dereferencing it.Reported-by TOTE Robot <[email protected]>Signed-off-by Tuo Li <[email protected]>--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +1
-2@@ -3635,7 +3635,7 @@ enum dc_status dcn10_set_clock(struct dc *dc, dc->clk_mgr->funcs->get_clock (dc->clk_mgr, context, clock_type, &clock_cfg); -if (!dc->clk_mgr->funcs->get_clock) +if (dc->clk_mgr && !dc->clk_mgr->funcs->get_clock)return DC_FAIL_UNSUPPORTED_1 ;if (clk_khz > clock_cfg.max_clock_khz) --2.25.1