hwmon: hp-wmi-sensors: Fix info_map[] allocation type
Subsystems (2)
PATCH 1/1 hwmon: hp-wmi-sensors: Fix info_map[] allocation type
From: Kees Cook <[email protected]>
In preparation for making the devm_kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)
The assigned type of "info_map[type]" is "struct hp_wmi_info **", but the converted allocation type would be "struct hp_wmi_info ***", as the size was taken from "*info_map", which is one level of indirection too many. Luckily both element types are pointers of the same size. Take the size from the element type of the assignment target.
Build tested ARCH=x86_64 allmodconfig with GCC 16.2.0:drivers/hwmon/hp-wmi-sensors.o
---
Cc: James Seo <[email protected]>
Cc: Guenter Roeck <[email protected]>
Cc: <[email protected]>
--- drivers/hwmon/hp-wmi-sensors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/hp-wmi-sensors.c +1 -1
@@ -1788,7 +1788,7 @@ static int init_numeric_sensors(struct hp_wmi_sensors *state,if (!info_map[type]) { info_map[type] =devm_kcalloc (dev, channel_count[type], -sizeof (*info_map), +sizeof (*info_map[type]),GFP_KERNEL );if (!info_map[type])return -ENOMEM ;
Signature · 1 line
2.34.1
[email protected]
AI reviewSashiko has reviewed this patch and found no issues. It looks great!
Quoted 14 lines
From: Kees Cook <[email protected]>
In preparation for making the
devm_kmallocfamily of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)The assigned type of "info_map[type]" is "struct
hp_wmi_info**", but the converted allocation type would be "structhp_wmi_info***", as the size was taken from "*info_map", which is one level of indirection too many. Luckily both element types are pointers of the same size. Take the size from the element type of the assignment target.
Quoted 5 lines
Build tested ARCH=x86_64 allmodconfig with GCC 16.2.0:
drivers/hwmon/hp-wmi-sensors.oAssisted-by LLM coccinelleSigned-off-by Kees Cook <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 19 lines · Kees Cook
drivers/hwmon/hp-wmi-sensors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/hwmon/hp-wmi-sensors.c +1
-1@@ -1788,7 +1788,7 @@ static int init_numeric_sensors(struct hp_wmi_sensors *state,if (!info_map[type]) { info_map[type] =devm_kcalloc (dev, channel_count[type], -sizeof (*info_map), +sizeof (*info_map[type]),GFP_KERNEL );if (!info_map[type])return -ENOMEM ;Signature · 1 line
2.34.1
Quoted 14 lines · Kees Cook
From: Kees Cook <[email protected]>
In preparation for making the
devm_kmallocfamily of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)The assigned type of "info_map[type]" is "struct
hp_wmi_info**", but the converted allocation type would be "structhp_wmi_info***", as the size was taken from "*info_map", which is one level of indirection too many. Luckily both element types are pointers of the same size. Take the size from the element type of the assignment target.
Quoted 6 lines
Build tested ARCH=x86_64 allmodconfig with GCC 16.2.0:
drivers/hwmon/hp-wmi-sensors.oAssisted-by LLM coccinelleSigned-off-by Kees Cook <[email protected]>Acked-by James Seo <[email protected]>
Applied.
Thanks,
Guenter