iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon fixes for v6.1-rc8

Browse Source 
- Fix refcount leak and NULL pointer access in coretemp driver
 
 - Fix UAF in ibmpex driver
 
 - Add missing pci_disable_device() to i5500_temp driver
 
 - Fix calculation in ina3221 driver
 
 - Fix temperature scaling in ltc2947 driver
 
 - Check result of devm_kcalloc call in asus-ec-sensors driver
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEiHPvMQj9QTOCiqgVyx8mb86fmYEFAmOI4z8ACgkQyx8mb86f
 mYGkVw//bRNXzSxR7CVZsukTBId3rnztk0Nzg3tJAkTBwoJknNBm1BpbpENTmnBt
 ir07aRhAkM/Vu4532kP8TOpe2k6gLbehzGmJIt3Eg3QB0/3CnwJcHVLEFwK/KeZH
 5I1fw8K7NWVsyD/9s4MA5E/qNFJh5YW8VgAQCMi+dYuc67erFJQFLG8o6aby7W1B
 aYH9cRp+ZjV2n8Y+tsh/GNe694ln9wKiCa5RlbspC8tiHH+RAcUdtscFX1tL5oxR
 iDAJ3A0F3de39hrCHE4LErZ4UcvNdCnGJzlmBIRkxSoSbbpbwNDDsswsJuZZ9NtD
 ErSc3zqKGS/dsbsLhMm8Ny0WcwEj1qIfg4Wfk8uAYFraiBYpQ+NITDtRN36mQoIL
 8WBzqs9n8pNnI3qQ602g24txlSYKLXvMgKoDYyglcRQkOca2Y13iGspK+QWQISRO
 pCkelFwlG/0JkR9ez11AxUOYAecwudgTMAlSd5YomxYT9fUq7zb8nWPokHLGrWCA
 paQgvJy+mmIt/3CZY2J3ecjoleuySqsVrWSQcUrLoYQ/wDIULKtNQGD6CAcYMtH4
 /A6Q4ZTH8lU+btYxTpc0FkUBxgkYISl1BC1Xa/ml20SLjWVbXklzlDf6Woqp9nz1
 bvwyzKW+SA56Dmf3D4/NIU6AJ7LgYTHBf7/rhp8xSaooY/aKVdY=
 =MhQc
 -----END PGP SIGNATURE-----

Merge tag 'hwmon-for-v6.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - Fix refcount leak and NULL pointer access in coretemp driver

 - Fix UAF in ibmpex driver

 - Add missing pci_disable_device() to i5500_temp driver

 - Fix calculation in ina3221 driver

 - Fix temperature scaling in ltc2947 driver

 - Check result of devm_kcalloc call in asus-ec-sensors driver

* tag 'hwmon-for-v6.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (asus-ec-sensors) Add checks for devm_kcalloc
  hwmon: (coretemp) fix pci device refcount leak in nv1a_ram_new()
  hwmon: (coretemp) Check for null before removing sysfs attrs
  hwmon: (ibmpex) Fix possible UAF when ibmpex_register_bmc() fails
  hwmon: (i5500_temp) fix missing pci_disable_device()
  hwmon: (ina3221) Fix shunt sum critical calculation
  hwmon: (ltc2947) fix temperature scaling
This commit is contained in:
Linus Torvalds 2022-12-01 11:10:25 -08:00
commit e214dd935b
6 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hwmon/asus-ec-sensors.c
View File

@ -938,6 +938,8 @@ static int asus_ec_probe(struct platform_device *pdev)
ec_data->nr_sensors = hweight_long(ec_data->board_info->sensors);
ec_data->sensors = devm_kcalloc(dev, ec_data->nr_sensors,
sizeof(struct ec_sensor), GFP_KERNEL);
if (!ec_data->sensors)
return -ENOMEM;
status = setup_lock_data(dev);
if (status) {

9
drivers/hwmon/coretemp.c
View File

@ -242,10 +242,13 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
*/
if (host_bridge && host_bridge->vendor == PCI_VENDOR_ID_INTEL) {
for (i = 0; i < ARRAY_SIZE(tjmax_pci_table); i++) {
if (host_bridge->device == tjmax_pci_table[i].device)
if (host_bridge->device == tjmax_pci_table[i].device) {
pci_dev_put(host_bridge);
return tjmax_pci_table[i].tjmax;
}
}
}
pci_dev_put(host_bridge);
for (i = 0; i < ARRAY_SIZE(tjmax_table); i++) {
if (strstr(c->x86_model_id, tjmax_table[i].id))
@ -533,6 +536,10 @@ static void coretemp_remove_core(struct platform_data *pdata, int indx)
{
struct temp_data *tdata = pdata->core_data[indx];
/* if we errored on add then this is already gone */
if (!tdata)
return;
/* Remove the sysfs attributes */
sysfs_remove_group(&pdata->hwmon_dev->kobj, &tdata->attr_group);

2
drivers/hwmon/i5500_temp.c
View File

@ -117,7 +117,7 @@ static int i5500_temp_probe(struct pci_dev *pdev,
u32 tstimer;
s8 tsfsc;
err = pci_enable_device(pdev);
err = pcim_enable_device(pdev);
if (err) {
dev_err(&pdev->dev, "Failed to enable device\n");
return err;

1
drivers/hwmon/ibmpex.c
View File

@ -502,6 +502,7 @@ static void ibmpex_register_bmc(int iface, struct device *dev)
return;
out_register:
list_del(&data->list);
hwmon_device_unregister(data->hwmon_dev);
out_user:
ipmi_destroy_user(data->user);

4
drivers/hwmon/ina3221.c
View File

@ -228,7 +228,7 @@ static int ina3221_read_value(struct ina3221_data *ina, unsigned int reg,
* Shunt Voltage Sum register has 14-bit value with 1-bit shift
* Other Shunt Voltage registers have 12 bits with 3-bit shift
*/
if (reg == INA3221_SHUNT_SUM)
if (reg == INA3221_SHUNT_SUM || reg == INA3221_CRIT_SUM)
*val = sign_extend32(regval >> 1, 14);
else
*val = sign_extend32(regval >> 3, 12);
@ -465,7 +465,7 @@ static int ina3221_write_curr(struct device *dev, u32 attr,
* SHUNT_SUM: (1 / 40uV) << 1 = 1 / 20uV
* SHUNT[1-3]: (1 / 40uV) << 3 = 1 / 5uV
*/
if (reg == INA3221_SHUNT_SUM)
if (reg == INA3221_SHUNT_SUM || reg == INA3221_CRIT_SUM)
regval = DIV_ROUND_CLOSEST(voltage_uv, 20) & 0xfffe;
else
regval = DIV_ROUND_CLOSEST(voltage_uv, 5) & 0xfff8;

2
drivers/hwmon/ltc2947-core.c
View File

@ -396,7 +396,7 @@ static int ltc2947_read_temp(struct device *dev, const u32 attr, long *val,
return ret;
/* in milidegrees celcius, temp is given by: */
*val = (__val * 204) + 550;
*val = (__val * 204) + 5500;
return 0;
}