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

drm/amdgpu: Fix type of second parameter in odn_edit_dpm_table() callback

With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG),
indirect call targets are validated against the expected function
pointer prototype to make sure the call target is valid to help mitigate
ROP attacks. If they are not identical, there is a failure at run time,
which manifests as either a kernel panic or thread getting killed. A
proposed warning in clang aims to catch these at compile time, which
reveals:

drivers/gpu/drm/amd/amdgpu/../pm/swsmu/amdgpu_smu.c:3008:29: error: incompatible function pointer types initializing 'int (*)(void *, uint32_t, long *, uint32_t)' (aka 'int (*)(void *, unsigned int, long *, unsigned int)') with an expression of type 'int (void *, enum PP_OD_DPM_TABLE_COMMAND, long *, uint32_t)' (aka 'int (void *, enum PP_OD_DPM_TABLE_COMMAND, long *, unsigned int)') [-Werror,-Wincompatible-function-pointer-types-strict]
.odn_edit_dpm_table = smu_od_edit_dpm_table,
^~~~~~~~~~~~~~~~~~~~~
1 error generated.

There are only two implementations of ->odn_edit_dpm_table() in 'struct
amd_pm_funcs': smu_od_edit_dpm_table() and pp_odn_edit_dpm_table(). One
has a second parameter type of 'enum PP_OD_DPM_TABLE_COMMAND' and the
other uses 'u32'. Ultimately, smu_od_edit_dpm_table() calls
->od_edit_dpm_table() from 'struct pptable_funcs' and
pp_odn_edit_dpm_table() calls ->odn_edit_dpm_table() from 'struct
pp_hwmgr_func', which both have a second parameter type of 'enum
PP_OD_DPM_TABLE_COMMAND'.

Update the type parameter in both the prototype in 'struct amd_pm_funcs'
and pp_odn_edit_dpm_table() to 'enum PP_OD_DPM_TABLE_COMMAND', which
cleans up the warning.

Link: https://github.com/ClangBuiltLinux/linux/issues/1750
Reported-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Nathan Chancellor and committed by
Alex Deucher
e4d0ef75 f0d0f108

+4 -2
+2 -1
drivers/gpu/drm/amd/include/kgd_pp_interface.h
··· 354 354 int (*get_power_profile_mode)(void *handle, char *buf); 355 355 int (*set_power_profile_mode)(void *handle, long *input, uint32_t size); 356 356 int (*set_fine_grain_clk_vol)(void *handle, uint32_t type, long *input, uint32_t size); 357 - int (*odn_edit_dpm_table)(void *handle, uint32_t type, long *input, uint32_t size); 357 + int (*odn_edit_dpm_table)(void *handle, enum PP_OD_DPM_TABLE_COMMAND type, 358 + long *input, uint32_t size); 358 359 int (*set_mp1_state)(void *handle, enum pp_mp1_state mp1_state); 359 360 int (*smu_i2c_bus_access)(void *handle, bool acquire); 360 361 int (*gfx_state_change_set)(void *handle, uint32_t state);
+2 -1
drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
··· 838 838 return hwmgr->hwmgr_func->set_fine_grain_clk_vol(hwmgr, type, input, size); 839 839 } 840 840 841 - static int pp_odn_edit_dpm_table(void *handle, uint32_t type, long *input, uint32_t size) 841 + static int pp_odn_edit_dpm_table(void *handle, enum PP_OD_DPM_TABLE_COMMAND type, 842 + long *input, uint32_t size) 842 843 { 843 844 struct pp_hwmgr *hwmgr = handle; 844 845