hwmon: core: add thermal sensors only if dev->of_node is present
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 hwmon: core: add thermal sensors only if dev->of_node is present
Drivers may register to hwmon and request for also registering with the thermal subsystem (HWMON_C_REGISTER_TZ). However, some of these driver, e.g. marvell phy, may be probed from Device Tree or being dynamically allocated, and in the later case, it will not have a dev->of_node entry.
Registering with hwmon without the dev->of_node may result in different outcomes depending on the device tree, which may be a bit misleading. If the device tree blob has no 'thermal-zones' node, the *hwmon_device_register*() family functions are going to gracefully succeed, because of-thermal, *thermal_zone_of_sensor_register() return -ENODEV in this case, and the hwmon error path handles this error code as success to cover for the case where CONFIG_THERMAL_OF is not set. However, if the device tree blob has the 'thermal-zones' entry, the *hwmon_device_register*() will always fail on callers with no dev->of_node, propagating -EINVAL.
If dev->of_node is not present, calling of-thermal does not make sense. For this reason, this patch checks first if the device has a of_node before going over the process of registering with the thermal subsystem of-thermal interface. And in this case, when a caller of *hwmon_device_register*() with HWMON_C_REGISTER_TZ and no dev->of_node will still register with hwmon, but not with the thermal subsystem. If all the hwmon part bits are in place, the registration will succeed.
--- drivers/hwmon/hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/hwmon.c +1 -1
@@ -619,7 +619,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,if (err) goto free_hwmon; -if (dev && chip && chip->ops->read && +if (dev && dev->of_node && chip && chip->ops->read && chip->info[0 ]->type == hwmon_chip && (chip->info[0 ]->config[0 ] &HWMON_C_REGISTER_TZ )) {const struct hwmon_channel_info **info = chip->info;
Signature · 1 line
2.21.0
Guenter Roeck
maintainerHi Eduardo,
Quoted 18 lines · Eduardo Valentin
Drivers may register to hwmon and request for also registering with the thermal subsystem (
HWMON_C_REGISTER_TZ). However, some of these driver, e.g. marvell phy, may be probed from Device Tree or being dynamically allocated, and in the later case, it will not have adev->of_nodeentry.Registering with hwmon without the
dev->of_nodemay result in different outcomes depending on the device tree, which may be a bit misleading. If the device tree blob has no 'thermal-zones' node, the *hwmon_device_register*() family functions are going to gracefully succeed, because of-thermal,*thermal_zone_of_sensor_register()return-ENODEVin this case, and the hwmon error path handles this error code as success to cover for the case whereCONFIG_THERMAL_OFis not set. However, if the device tree blob has the 'thermal-zones' entry, the *hwmon_device_register*() will always fail on callers with nodev->of_node, propagating-EINVAL.
Quoted 9 lines
If
dev->of_nodeis not present, calling of-thermal does not make sense. For this reason, this patch checks first if the device has aof_nodebefore going over the process of registering with the thermal subsystem of-thermal interface. And in this case, when a caller of *hwmon_device_register*() withHWMON_C_REGISTER_TZand nodev->of_nodewill still register with hwmon, but not with the thermal subsystem. If all the hwmon part bits are in place, the registration will succeed.
Makes sense. I'd apply it as-is, but it would be better if you resend it to the list to give others a chance to comment.
Thanks,
Guenter
Quoted 25 lines
Cc Jean Delvare <[email protected]>Cc Guenter Roeck <[email protected]>Signed-off-by Eduardo Valentin <[email protected]>--- drivers/hwmon/hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/hwmon/hwmon.c +1
-1@@ -619,7 +619,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,if (err) goto free_hwmon; -if (dev && chip && chip->ops->read && +if (dev && dev->of_node && chip && chip->ops->read && chip->info[0 ]->type == hwmon_chip && (chip->info[0 ]->config[0 ] &HWMON_C_REGISTER_TZ )) {const struct hwmon_channel_info **info = chip->info;Signature · 1 line
2.21.0
Quoted 30 lines · Guenter Roeck
Hi Eduardo,
Quoted 18 lines · Eduardo Valentin
Drivers may register to hwmon and request for also registering with the thermal subsystem (
HWMON_C_REGISTER_TZ). However, some of these driver, e.g. marvell phy, may be probed from Device Tree or being dynamically allocated, and in the later case, it will not have adev->of_nodeentry.Registering with hwmon without the
dev->of_nodemay result in different outcomes depending on the device tree, which may be a bit misleading. If the device tree blob has no 'thermal-zones' node, the *hwmon_device_register*() family functions are going to gracefully succeed, because of-thermal,*thermal_zone_of_sensor_register()return-ENODEVin this case, and the hwmon error path handles this error code as success to cover for the case whereCONFIG_THERMAL_OFis not set. However, if the device tree blob has the 'thermal-zones' entry, the *hwmon_device_register*() will always fail on callers with nodev->of_node, propagating-EINVAL.Quoted 9 lines
If
dev->of_nodeis not present, calling of-thermal does not make sense. For this reason, this patch checks first if the device has aof_nodebefore going over the process of registering with the thermal subsystem of-thermal interface. And in this case, when a caller of *hwmon_device_register*() withHWMON_C_REGISTER_TZand nodev->of_nodewill still register with hwmon, but not with the thermal subsystem. If all the hwmon part bits are in place, the registration will succeed.
Quoted 2 lines
Makes sense. I'd apply it as-is, but it would be better if you resend it to the list to give others a chance to comment.
Ok Cool.
Yeah, the patches were copied to the mailing list. Only the cover letter somehow I forgot to copy the mailing lists while git-sending-email.
I will resend the two patches (and the cover letter) after fixing the comment on patch 2/2.
Quoted 29 lines
Thanks,
GuenterQuoted 25 lines
Cc Jean Delvare <[email protected]>Cc Guenter Roeck <[email protected]>Signed-off-by Eduardo Valentin <[email protected]>--- drivers/hwmon/hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/hwmon/hwmon.c +1
-1@@ -619,7 +619,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,if (err) goto free_hwmon; -if (dev && chip && chip->ops->read && +if (dev && dev->of_node && chip && chip->ops->read && chip->info[0 ]->type == hwmon_chip && (chip->info[0 ]->config[0 ] &HWMON_C_REGISTER_TZ )) {const struct hwmon_channel_info **info = chip->info;Signature · 1 line
2.21.0
Signature · 2 lines
All the best, Eduardo Valentin
PATCH 2/2 hwmon: core: fix potential memory leak in *hwmon_device_register*
In reply to a message not in the archiveWhen registering a hwmon device with HWMON_C_REGISTER_TZ flag in place, the hwmon subsystem will attempt to register the device also with the thermal subsystem. When the of-thermal registration fails, __hwmon_device_register jumps to ida_remove, leaving the locally allocated hwdev pointer and also the hdev registered.
This patch fixes both issues by jumping to a new label that will first unregister hdev and the fall into the kfree of hwdev to finally remove the idas and propagate the error code.
--- drivers/hwmon/hwmon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hwmon/hwmon.c +3 -1
@@ -637,7 +637,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata, hwdev, j);if (err) {device_unregister (hdev); - goto ida_remove; + goto device_unregister; } } }
@@ -646,6 +646,8 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,return hdev; +device_unregister: +device_unregister (hdev); free_hwmon:kfree (hwdev); ida_remove:
Signature · 1 line
2.21.0
Guenter Roeck
maintainerRe: [PATCH 2/2] hwmon: core: fix potential memory leak in *hwmon_device_register*
Hi Eduardo,
Quoted 24 lines · Eduardo Valentin
When registering a hwmon device with
HWMON_C_REGISTER_TZflag in place, the hwmon subsystem will attempt to register the device also with the thermal subsystem. When the of-thermal registration fails,__hwmon_device_registerjumps toida_remove, leaving the locally allocated hwdev pointer and also the hdev registered.This patch fixes both issues by jumping to a new label that will first unregister hdev and the fall into the kfree of hwdev to finally remove the idas and propagate the error code.
Cc Jean Delvare <[email protected]>Cc Guenter Roeck <[email protected]>Signed-off-by Eduardo Valentin <[email protected]>--- drivers/hwmon/hwmon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/hwmon/hwmon.c +0
-0
drivers/hwmon/hwmon.c __hwmon_device_register(struct device *dev, const char *name, void *drvdata, · line 640
Quoted 5 lines
drivers/hwmon/hwmon.c +1
-1@@ -637,7 +637,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata, hwdev, j);if (err) {device_unregister (hdev); - goto ida_remove; + goto device_unregister;
Good find, but device_unregister() is already called above.
You need to either remove that, or replace the goto to point to free_hwmon. The new label would probably the cleaner solution since it follows the coding style.
Thanks
Guenter
Quoted 15 lines
drivers/hwmon/hwmon.c +2
-0} } }@@ -646,6 +646,8 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,return hdev; +device_unregister: +device_unregister (hdev); free_hwmon:kfree (hwdev); ida_remove:Signature · 1 line
2.21.0
Re: [PATCH 2/2] hwmon: core: fix potential memory leak in *hwmon_device_register*
Quoted 22 lines · Guenter Roeck
Hi Eduardo,
Quoted 19 lines · Eduardo Valentin
When registering a hwmon device with
HWMON_C_REGISTER_TZflag in place, the hwmon subsystem will attempt to register the device also with the thermal subsystem. When the of-thermal registration fails,__hwmon_device_registerjumps toida_remove, leaving the locally allocated hwdev pointer and also the hdev registered.This patch fixes both issues by jumping to a new label that will first unregister hdev and the fall into the kfree of hwdev to finally remove the idas and propagate the error code.
Cc Jean Delvare <[email protected]>Cc Guenter Roeck <[email protected]>Signed-off-by Eduardo Valentin <[email protected]>--- drivers/hwmon/hwmon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 15 lines
drivers/hwmon/hwmon.c __hwmon_device_register(struct device *dev, const char *name, void *drvdata, · line 640
Quoted 10 lines
drivers/hwmon/hwmon.c +1
-1@@ -637,7 +637,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata, hwdev, j);if (err) {device_unregister (hdev); - goto ida_remove; + goto device_unregister;Good find, but
device_unregister()is already called above.
You need to either remove that, or replace the goto to point tofree_hwmon. The new label would probably the cleaner solution since it follows the coding style.
Right, somehow I completely missed that unregister call. In any case, I will take the route of adding a new label and remove the unregister call above.
Quoted 19 lines
Thanks
GuenterQuoted 15 lines
drivers/hwmon/hwmon.c +2
-0} } }@@ -646,6 +646,8 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,return hdev; +device_unregister: +device_unregister (hdev); free_hwmon:kfree (hwdev); ida_remove:Signature · 1 line
2.21.0
Signature · 2 lines
All the best, Eduardo Valentin