* [PATCH] hwmon: hp-wmi-sensors: Fix info_map[] allocation type
@ 2026-09-17 21:13 Kees Cook
2026-09-17 21:36 ` James Seo
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2026-09-17 21:13 UTC (permalink / raw)
To: James Seo
Cc: Kees Cook, Kees Cook, Guenter Roeck, linux-hwmon, linux-kernel,
linux-hardening
From: Kees Cook <kees+treewide@kernel.org>
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
Assisted-by: LLM coccinelle
Signed-off-by: Kees Cook <kees+treewide@kernel.org>
---
Cc: James Seo <james@equiv.tech>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: <linux-hwmon@vger.kernel.org>
---
drivers/hwmon/hp-wmi-sensors.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hwmon/hp-wmi-sensors.c b/drivers/hwmon/hp-wmi-sensors.c
index 03c684ba83bd..cc193a8890f2 100644
--- a/drivers/hwmon/hp-wmi-sensors.c
+++ b/drivers/hwmon/hp-wmi-sensors.c
@@ -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;
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] hwmon: hp-wmi-sensors: Fix info_map[] allocation type
2026-09-17 21:13 [PATCH] hwmon: hp-wmi-sensors: Fix info_map[] allocation type Kees Cook
@ 2026-09-17 21:36 ` James Seo
0 siblings, 0 replies; 2+ messages in thread
From: James Seo @ 2026-09-17 21:36 UTC (permalink / raw)
To: Kees Cook
Cc: Kees Cook, Guenter Roeck, linux-hwmon, linux-kernel, linux-hardening
On Thu, Sep 17, 2026 at 02:13:39PM -0700, Kees Cook wrote:
> drivers/hwmon/hp-wmi-sensors.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hwmon/hp-wmi-sensors.c b/drivers/hwmon/hp-wmi-sensors.c
> index 03c684ba83bd..cc193a8890f2 100644
> --- a/drivers/hwmon/hp-wmi-sensors.c
> +++ b/drivers/hwmon/hp-wmi-sensors.c
> @@ -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;
> --
> 2.34.1
>
Acked-by: James Seo <james@equiv.tech>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-09-17 21:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-17 21:13 [PATCH] hwmon: hp-wmi-sensors: Fix info_map[] allocation type Kees Cook
2026-09-17 21:36 ` James Seo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®