[AMD Official Use Only - Approved for External Use]
Hi David,
Thank you for noticing and submitting a fix. You may use
Signed-off-by: Naveen Krishna Chatradhi <nchat...@amd.com>
Regards,
Naveenk
-----Original Message-----
From: David Arcari <darc...@redhat.com>
Sent: Thursday, January 7, 2021 8:17 PM
To: linux-hw...@vger.kernel.org
Cc: David Arcari <darc...@redhat.com>; Chatradhi, Naveen Krishna
<naveenkrishna.chatra...@amd.com>; Jean Delvare <jdelv...@suse.com>; Guenter
Roeck <li...@roeck-us.net>; linux-kernel@vger.kernel.org; sta...@vger.kernel.org
Subject: [PATCH] hwmon: (amd_energy) fix allocation of hwmon_channel_info config
[CAUTION: External Email]
hwmon, specifically hwmon_num_channel_attrs, expects the config array in the
hwmon_channel_info structure to be terminated by a zero entry. amd_energy does
not honor this convention. As result, a KASAN warning is possible. Fix this
by adding an additional entry and setting it to zero.
Fixes: 8abee9566b7e ("hwmon: Add amd_energy driver to report energy counters")
Signed-off-by: David Arcari <darc...@redhat.com>
Cc: Naveen Krishna Chatradhi <nchat...@amd.com>
[naveenk:] Signed-off-by: Naveen Krishna Chatradhi <nchat...@amd.com>
Cc: Jean Delvare <jdelv...@suse.com>
Cc: Guenter Roeck <li...@roeck-us.net>
Cc: linux-kernel@vger.kernel.org
Cc: sta...@vger.kernel.org
---
drivers/hwmon/amd_energy.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/hwmon/amd_energy.c b/drivers/hwmon/amd_energy.c index
9b306448b7a0..822c2e74b98d 100644
--- a/drivers/hwmon/amd_energy.c
+++ b/drivers/hwmon/amd_energy.c
@@ -222,7 +222,7 @@ static int amd_create_sensor(struct device *dev,
*/
cpus = num_present_cpus() / num_siblings;
- s_config = devm_kcalloc(dev, cpus + sockets,
+ s_config = devm_kcalloc(dev, cpus + sockets + 1,
sizeof(u32), GFP_KERNEL);
if (!s_config)
return -ENOMEM;
@@ -254,6 +254,7 @@ static int amd_create_sensor(struct device *dev,
scnprintf(label_l[i], 10, "Esocket%u", (i - cpus));
}
+ s_config[i] = 0;
return 0;
}
--
2.18.1
