drm/amd/powerplay/smu10_hwmgr: use struct_size() in kzalloc()
Subsystems (2)
PATCH 1/1 drm/amd/powerplay/smu10_hwmgr: use struct_size() in kzalloc()
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example:
struct foo {
int stuff;
struct boo entry[];
};size = sizeof(struct foo) + count * sizeof(struct boo); instance = kzalloc(size, GFP_KERNEL);
Instead of leaving these open-coded and prone to type mistakes, we can now use the new struct_size() helper:
instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL);
Notice that, in this case, variable table_size is not necessary, hence it is removed.
This code was detected with the help of Coccinelle.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +3 -5
@@ -139,12 +139,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) { -uint32_t table_size = -sizeof (struct phm_clock_voltage_dependency_table ) + - (7 *sizeof (struct phm_clock_voltage_dependency_record )); +struct phm_clock_voltage_dependency_table *table_clk_vlt; -struct phm_clock_voltage_dependency_table *table_clk_vlt = -kzalloc (table_size,GFP_KERNEL ); + table_clk_vlt =kzalloc (struct_size (table_clk_vlt, entries,7 ), +GFP_KERNEL );if (NULL == table_clk_vlt) {pr_err ("Can not allocate memory!\n" );
Signature · 1 line
2.20.1
Alex Deucher
AppliedQuoted 16 lines · Gustavo A. R. Silva
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example:
struct foo { int stuff; struct boo entry[]; };size = sizeof(struct foo) + count * sizeof(struct boo); instance =
kzalloc(size, GFP_KERNEL);Instead of leaving these open-coded and prone to type mistakes, we can now use the new
struct_size()helper:
Quoted 8 lines
instance =
kzalloc(struct_size(instance, entry, count), GFP_KERNEL);Notice that, in this case, variable
table_sizeis not necessary, hence it is removed.This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Applied this and the smu8 patch. Thanks!
Alex
Quoted 27 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +3
-6@@ -139,12 +139,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) { -uint32_t table_size = -sizeof (struct phm_clock_voltage_dependency_table ) + - (7 *sizeof (struct phm_clock_voltage_dependency_record )); +struct phm_clock_voltage_dependency_table *table_clk_vlt; -struct phm_clock_voltage_dependency_table *table_clk_vlt = -kzalloc (table_size,GFP_KERNEL ); + table_clk_vlt =kzalloc (struct_size (table_clk_vlt, entries,7 ), +GFP_KERNEL );if (NULL == table_clk_vlt) {pr_err ("Can not allocate memory!\n" ); --2.20.1
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 20 lines · Alex Deucher
Quoted 18 lines · Gustavo A. R. Silva
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example:
struct foo { int stuff; struct boo entry[]; };size = sizeof(struct foo) + count * sizeof(struct boo); instance =
kzalloc(size, GFP_KERNEL);Instead of leaving these open-coded and prone to type mistakes, we can now use the new
struct_size()helper:instance =
kzalloc(struct_size(instance, entry, count), GFP_KERNEL);
Quoted 9 lines
Quoted 6 lines
Notice that, in this case, variable
table_sizeis not necessary, hence it is removed.This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>Applied this and the smu8 patch. Thanks!
Great!
Thanks, Alex.
--
Gustavo