Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1516812
| From | Eduardo Valentin <edubezval@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCHv2 01/49] thermal: core: prevent zones with no types to be registered |
| Date | 2016-11-08 06:30 +0100 |
| Message-ID | <sB78R-572-7@gated-at.bofh.it> (permalink) |
| References | <sB6Pv-4XD-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
There are APIs that rely on tz->type. This patch
prevent thermal zones without it to be registered.
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
---
drivers/thermal/thermal_core.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 226b0b4ac..ec0d158 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1873,6 +1873,9 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
int passive = 0;
struct thermal_governor *governor;
+ if (!type || strlen(type) == 0)
+ return ERR_PTR(-EINVAL);
+
if (type && strlen(type) >= THERMAL_NAME_LENGTH)
return ERR_PTR(-EINVAL);
@@ -1898,7 +1901,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
return ERR_PTR(result);
}
- strlcpy(tz->type, type ? : "", sizeof(tz->type));
+ strlcpy(tz->type, type, sizeof(tz->type));
tz->ops = ops;
tz->tzp = tzp;
tz->device.class = &thermal_class;
@@ -1918,11 +1921,9 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
}
/* sys I/F */
- if (type) {
- result = device_create_file(&tz->device, &dev_attr_type);
- if (result)
- goto unregister;
- }
+ result = device_create_file(&tz->device, &dev_attr_type);
+ if (result)
+ goto unregister;
result = device_create_file(&tz->device, &dev_attr_temp);
if (result)
@@ -2071,8 +2072,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
thermal_zone_device_set_polling(tz, 0);
- if (tz->type[0])
- device_remove_file(&tz->device, &dev_attr_type);
+ device_remove_file(&tz->device, &dev_attr_type);
device_remove_file(&tz->device, &dev_attr_temp);
if (tz->ops->get_mode)
device_remove_file(&tz->device, &dev_attr_mode);
--
2.1.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCHv2 00/49] thermal: reorganizing thermal core Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:10 +0100 [PATCHv2 03/49] thermal: core: group device_create_file() calls that are always created Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:10 +0100 [PATCHv2 16/49] thermal: core: split passive_store Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 18/49] thermal: core: split available_policies_show() Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 30/49] thermal: core: move __unbind() helper to where it is used Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 39/49] thermal: core: add a comment describing the device management section Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 24/49] thermal: core: move cooling device sysfs to thermal_sysfs.c Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 37/49] thermal: core: add a comment describing the main update loop Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 36/49] thermal: core: move notify to the zone update section Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 05/49] thermal: core: move emul_temp creation to tz->device.groups Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 07/49] thermal: core: move passive attr to tz->device.groups Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 38/49] thermal: core: add a comment describing the power actor section Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 12/49] thermal: core: move the trip attrs to the tz sysfs I/F section Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 09/49] thermal: core: move power actor code out of sysfs I/F section Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 46/49] thermal: core: improve kerneldoc entry of thermal_cooling_device_unregister Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 48/49] thermal: sysfs: use kcalloc() instead of kzalloc() Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 17/49] thermal: core: split policy_store Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 23/49] thermal: core: move to_cooling_device macro to header file Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 33/49] thermal: core: fix couple of style issues on __bind() helper Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 19/49] thermal: core: move to_thermal_zone() macro to header file Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 21/49] thermal: core: match parenthesis on code alignment Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 43/49] thermal: core: standardize line breaking alignment Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 22/49] thermal: core: move thermal_zone sysfs to thermal_sysfs.c Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 40/49] thermal: sysfs: remove symbols of emul_temp when config is disabled Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 11/49] thermal: core: fix style on remove_trip_attrs() Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 32/49] thermal: core: move bind_tz() to where it is used Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 41/49] thermal: core: remove FSF address in the GPL notice Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 02/49] thermal: core: group thermal_zone DEVICE_ATTR's declarations Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 14/49] thermal: core: move trips attributes to tz->device.groups Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 20/49] thermal: core: treat correctly the return value of *scanf calls Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:20 +0100 [PATCHv2 29/49] thermal: core: small style fix on __unbind() helper Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 10/49] thermal: core: remove useless empty line Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 28/49] thermal: core: move idr handling to device management section Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 04/49] thermal: core: use dev.groups to manage always present tz attributes Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 06/49] thermal: core: move mode attribute to tz->device.groups Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 01/49] thermal: core: prevent zones with no types to be registered Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 42/49] thermal: core: small style fix when checking for __find_governor() Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 44/49] thermal: core: remove void function return statements Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 27/49] thermal: core: group functions related to governor handling Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 35/49] thermal: core: add inline to print_bind_err_msg() Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 25/49] thermal: core: remove a couple of style issues on helpers Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 13/49] thermal: core: create tz->device.groups dynamically Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 49/49] thermal: core: move slop and offset helpers to thermal_helpers.c Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 31/49] thermal: core: move bind_cdev() to where it is used Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:30 +0100 [PATCHv2 45/49] thermal: core: remove style warnings and checks Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:40 +0100 [PATCHv2 26/49] thermal: core: introduce thermal_helpers.c Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 06:40 +0100 [PATCHv2 47/49] thermal: core: use kzalloc(sizeof(*ptr),...) Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 07:10 +0100 [PATCHv2 15/49] thermal: core: remove unnecessary device_remove() calls Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 07:20 +0100 [PATCHv2 08/49] thermal: core: improve power actor documentation Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 10:00 +0100 [PATCHv2 34/49] thermal: core: move __bind() to where it is used Eduardo Valentin <edubezval@gmail.com> - 2016-11-08 10:10 +0100
csiph-web