* [PATCH] hwmon: asus_wmi_sensors: Fix info[] allocation type
@ 2026-09-17 21:13 Kees Cook
2026-09-18 15:04 ` Guenter Roeck
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2026-09-17 21:13 UTC (permalink / raw)
To: Ed Brindley
Cc: Kees Cook, Kees Cook, Denis Pauk, 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 "sensor_data->wmi.info[type]" is
"const struct asus_wmi_sensor_info **", but the converted allocation
type would be "const struct asus_wmi_sensor_info ***", as the size was
taken from "*sensor_data->wmi.info", 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/asus_wmi_sensors.o
Assisted-by: LLM coccinelle
Signed-off-by: Kees Cook <kees+treewide@kernel.org>
---
Cc: Ed Brindley <kernel@maidavale.org>
Cc: Denis Pauk <pauk.denis@gmail.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: <linux-hwmon@vger.kernel.org>
---
drivers/hwmon/asus_wmi_sensors.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hwmon/asus_wmi_sensors.c b/drivers/hwmon/asus_wmi_sensors.c
index c2dd7ff882f2..621e3506972d 100644
--- a/drivers/hwmon/asus_wmi_sensors.c
+++ b/drivers/hwmon/asus_wmi_sensors.c
@@ -573,7 +573,7 @@ static int asus_wmi_configure_sensor_setup(struct device *dev,
sensor_data->wmi.info[type] = devm_kcalloc(dev,
nr_count[type],
- sizeof(*sensor_data->wmi.info),
+ sizeof(*sensor_data->wmi.info[type]),
GFP_KERNEL);
if (!sensor_data->wmi.info[type])
return -ENOMEM;
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] hwmon: asus_wmi_sensors: Fix info[] allocation type
2026-09-17 21:13 [PATCH] hwmon: asus_wmi_sensors: Fix info[] allocation type Kees Cook
@ 2026-09-18 15:04 ` Guenter Roeck
0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2026-09-18 15:04 UTC (permalink / raw)
To: Kees Cook
Cc: Ed Brindley, Kees Cook, Denis Pauk, linux-hwmon, linux-kernel,
linux-hardening
On Thu, Sep 17, 2026 at 02:13:33PM -0700, Kees Cook wrote:
> 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 "sensor_data->wmi.info[type]" is
> "const struct asus_wmi_sensor_info **", but the converted allocation
> type would be "const struct asus_wmi_sensor_info ***", as the size was
> taken from "*sensor_data->wmi.info", 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/asus_wmi_sensors.o
>
> Assisted-by: LLM coccinelle
> Signed-off-by: Kees Cook <kees+treewide@kernel.org>
Applied.
Thanks,
Guenter
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-09-18 15:04 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: asus_wmi_sensors: Fix info[] allocation type Kees Cook
2026-09-18 15:04 ` Guenter Roeck
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®