Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/amd/display: Fix dereference-before-check for dc_link

The function dereferences amdgpu_dm_connector->dc_link early to
initialize verified_link_cap and dc, but later still checks
amdgpu_dm_connector->dc_link for NULL in the analog path.

This late NULL check is redundant, introduce a local dc_link pointer,
use it consistently, and drop the superfluous NULL check while using
dc_link->link_id.id instead.

The function uses dc_link at the very beginning without checking if it
is NULL. But later in the code, it suddenly checks if dc_link is NULL.

This check is too late to be useful, because the code has already used
dc_link earlier. So this NULL check does nothing.

We simplify the code by storing amdgpu_dm_connector->dc_link in a local
dc_link variable and using it throughout the function. Since dc_link is
already dereferenced early, the later NULL check is unnecessary and is
removed.

Fixes the below:
amdgpu_dm_connector_get_modes():
variable dereferenced before check 'amdgpu_dm_connector->dc_link'

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c
8845 &amdgpu_dm_connector->dc_link->verified_link_cap;
8846 const struct dc *dc = amdgpu_dm_connector->dc_link->dc;
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Dereference
...

8856
8857 if (amdgpu_dm_connector->dc_sink &&
8858 amdgpu_dm_connector->dc_link &&
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Checked too late.
Presumably this NULL check could be removed?
...

Fixes: d46e422f65ae ("drm/amd/display: Cleanup uses of the analog flag")
Reported by: Dan Carpenter <dan.carpenter@linaro.org>
Cc: Timur Kristóf <timur.kristof@gmail.com>
Cc: Aurabindo Pillai <aurabindo.pillai@amd.com>
Cc: Roman Li <roman.li@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Tom Chung <chiahsuan.chung@amd.com>
Cc: Alex Hung <alex.hung@amd.com>
Cc: Ivan Lipski <ivan.lipski@amd.com>
Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Srinivasan Shanmugam and committed by
Alex Deucher
0563d172 f6eeab30

+4 -5
+4 -5
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
··· 8854 8854 { 8855 8855 struct amdgpu_dm_connector *amdgpu_dm_connector = 8856 8856 to_amdgpu_dm_connector(connector); 8857 + struct dc_link *dc_link = amdgpu_dm_connector->dc_link; 8857 8858 struct drm_encoder *encoder; 8858 8859 const struct drm_edid *drm_edid = amdgpu_dm_connector->drm_edid; 8859 - struct dc_link_settings *verified_link_cap = 8860 - &amdgpu_dm_connector->dc_link->verified_link_cap; 8861 - const struct dc *dc = amdgpu_dm_connector->dc_link->dc; 8860 + struct dc_link_settings *verified_link_cap = &dc_link->verified_link_cap; 8861 + const struct dc *dc = dc_link->dc; 8862 8862 8863 8863 encoder = amdgpu_dm_connector_to_encoder(connector); 8864 8864 ··· 8870 8870 drm_add_modes_noedid(connector, 1920, 1080); 8871 8871 8872 8872 if (amdgpu_dm_connector->dc_sink && 8873 - amdgpu_dm_connector->dc_link && 8874 8873 amdgpu_dm_connector->dc_sink->edid_caps.analog && 8875 - dc_connector_supports_analog(amdgpu_dm_connector->dc_link->link_id.id)) { 8874 + dc_connector_supports_analog(dc_link->link_id.id)) { 8876 8875 /* Analog monitor connected by DAC load detection. 8877 8876 * Add common modes. It will be up to the user to select one that works. 8878 8877 */