Commit 4d53f521 authored by mengwang's avatar mengwang Committed by Alex Deucher
Browse files

drm/amd/pm: correct table_clk_vlt memory size due to replacing one-element... 

drm/amd/pm: correct table_clk_vlt memory size due to replacing one-element array with flexible-array in struct phm_clock_voltage_dependency_table

Add 1 to the size passed to kzalloc after replacing one-element array.

There is a regular need in the kernel to provide a way to declare having
a dynamically sized set of trailing elements in a structure. Kernel code
should always use “flexible array members”[1] for these cases. The older
style of one-element or zero-length arrays should no longer be used[2].

Refactor the code according to the use of a flexible-array member in
struct phm_ppt_v1_mm_clock_voltage_dependency_table, instead of a
one-element array, and use the struct_size() helper to calculate the
size for the allocation.

[1] https://en.wikipedia.org/wiki/Flexible_array_member
[2] https://www.kernel.org/doc/html/v5.9-rc1/process/deprecated.html#zero-length-and-one-element-arrays



Signed-off-by: default avatarMengbing Wang <mengbing.wang@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 349a3289

drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c

+3 −2
Original line number Diff line number Diff line
@@ -130,9 +130,10 @@ static int smu10_construct_max_power_limits_table(struct pp_hwmgr *hwmgr, 
static int smu10_init_dynamic_state_adjustment_rule_settings(

							struct pp_hwmgr *hwmgr)

{

	int count = 8;

	struct phm_clock_voltage_dependency_table *table_clk_vlt;



	table_clk_vlt = kzalloc(struct_size(table_clk_vlt, entries, 7),

	table_clk_vlt = kzalloc(struct_size(table_clk_vlt, entries, count),

				GFP_KERNEL);



	if (NULL == table_clk_vlt) {
@@ -140,7 +141,7 @@ static int smu10_init_dynamic_state_adjustment_rule_settings( 
		return -ENOMEM;

	}



	table_clk_vlt->count = 8;

	table_clk_vlt->count = count;

	table_clk_vlt->entries[0].clk = PP_DAL_POWERLEVEL_0;

	table_clk_vlt->entries[0].v = 0;

	table_clk_vlt->entries[1].clk = PP_DAL_POWERLEVEL_1;