thermal: hwmon: Make the check for critical temp valid consistent (e8db5d67) · Commits · 戴 / test

On 05/21/2014 04:22 PM, Aaron Lu wrote: > On 05/21/2014 01:57 PM, Kui Zhang wrote: >> Hello, >> >> I get following error when rmmod thermal. >> >> rmmod thermal >> Killed While dealing with this problem, I found another problem that also results in a kernel crash on thermal module removal: From: Aaron Lu <aaron.lu@intel.com> Date: Wed, 21 May 2014 16:05:38 +0800 Subject: [PATCH] thermal: hwmon: Make the check for critical temp valid consistent We used the tz->ops->get_crit_temp && !tz->ops->get_crit_temp(tz, temp) to decide if we need to create the temp_crit attribute file but we just check if tz->ops->get_crit_temp exists to decide if we need to remove that attribute file. Some ACPI thermal zone doesn't have a valid critical trip point and that would result in removing a non-existent device file on thermal module unload. Cc: All applicable <stable@vger.kernel.org> Signed-off-by:

Aaron Lu <aaron.lu@intel.com> Signed-off-by:

Zhang Rui <rui.zhang@intel.com>

drivers/thermal/thermal_hwmon.c

+18 −15

Original line number	Diff line number	Diff line
		@@ -140,6 +140,12 @@ thermal_hwmon_lookup_temp(const struct thermal_hwmon_device *hwmon,
		return NULL;
		}

		static bool thermal_zone_crit_temp_valid(struct thermal_zone_device *tz)
		{
		unsigned long temp;
		return tz->ops->get_crit_temp && !tz->ops->get_crit_temp(tz, &temp);
		}

		int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
		{
		struct thermal_hwmon_device *hwmon;
		@@ -189,9 +195,7 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
		if (result)
		goto free_temp_mem;

		if (tz->ops->get_crit_temp) {
		unsigned long temperature;
		if (!tz->ops->get_crit_temp(tz, &temperature)) {
		if (thermal_zone_crit_temp_valid(tz)) {
		snprintf(temp->temp_crit.name,
		sizeof(temp->temp_crit.name),
		"temp%d_crit", hwmon->count);
		@@ -204,7 +208,6 @@ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
		if (result)
		goto unregister_input;
		}
		}

		mutex_lock(&thermal_hwmon_list_lock);
		if (new_hwmon_device)
		@@ -250,7 +253,7 @@ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
		}

		device_remove_file(hwmon->device, &temp->temp_input.attr);
		if (tz->ops->get_crit_temp)
		if (thermal_zone_crit_temp_valid(tz))
		device_remove_file(hwmon->device, &temp->temp_crit.attr);

		mutex_lock(&thermal_hwmon_list_lock);

Admin message