The patch titled thermal: add sanity check for the passive attribute has been added to the -mm tree. Its filename is thermal-add-sanity-check-for-the-passive-attribute.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: thermal: add sanity check for the passive attribute From: Frans Pop <elendil@xxxxxxxxx> Values below 1000 milli-celsius don't make sense and can cause the system to go into a thermal heart attack: the actual temperature will always be lower and thus the system will be throttled down to its lowest setting. An additional problem is that values below 1000 will show as 0 in /proc/acpi/thermal/TZx/trip_points:passive. cat passive 0 echo -n 90 >passive bash: echo: write error: Invalid argument echo -n 90000 >passive cat passive 90000 Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13918 Signed-off-by: Frans Pop <elendil@xxxxxxxxx> Cc: Matthew Garrett <mjg@xxxxxxxxxx> Cc: Zhang Rui <rui.zhang@xxxxxxxxx> Cc: Len Brown <lenb@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- diff -puN Documentation/thermal/sysfs-api.txt~thermal-add-sanity-check-for-the-passive-attribute Documentation/thermal/sysfs-api.txt --- a/Documentation/thermal/sysfs-api.txt~thermal-add-sanity-check-for-the-passive-attribute +++ a/Documentation/thermal/sysfs-api.txt @@ -206,6 +206,7 @@ passive passive trip point for the zone. Activation is done by polling with an interval of 1 second. Unit: millidegrees Celsius + Valid values: 0 (disabled) or greater than 1000 RW, Optional ***************************** diff -puN drivers/thermal/thermal_sys.c~thermal-add-sanity-check-for-the-passive-attribute drivers/thermal/thermal_sys.c --- a/drivers/thermal/thermal_sys.c~thermal-add-sanity-check-for-the-passive-attribute +++ a/drivers/thermal/thermal_sys.c @@ -225,6 +225,12 @@ passive_store(struct device *dev, struct if (!sscanf(buf, "%d\n", &state)) return -EINVAL; + /* sanity check: values below 1000 millicelcius don't make sense + * and can cause the system to go into a thermal heart attack + */ + if (state && state < 1000) + return -EINVAL; + if (state && !tz->forced_passive) { mutex_lock(&thermal_list_lock); list_for_each_entry(cdev, &thermal_cdev_list, node) { _ Patches currently in -mm which might be from elendil@xxxxxxxxx are linux-next.patch thermal-sysfs-apitxt-reformat-for-improved-readability.patch thermal-sysfs-apitxt-document-passive-attribute-for-thermal-zones.patch acpi-thermal-display-forced-passive-trip-points-in-proc.patch thermal-add-sanity-check-for-the-passive-attribute.patch thermal-only-set-passive_delay-for-forced_passive-cooling.patch thermal-disable-polling-if-passive_delay-and-polling_delay-are-both-unset.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html