Commit 299d6e47 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-v5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux 

Pull thermal fixes from Daniel Lezcano:

 - Fix thermal shutdown after a suspend/resume due to a wrong TCC value
   restored on Intel platform (Antoine Tenart)

 - Fix potential buffer overflow when building the list of policies. The
   buffer size is not updated after writing to it (Dan Carpenter)

 - Fix wrong check against IS_ERR instead of NULL (Ansuel Smith)

* tag 'thermal-v5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal/drivers/tsens: Fix wrong check for tzd in irq handlers
  thermal/core: Potential buffer overflow in thermal_build_list_of_policies()
  thermal/drivers/int340x: Do not set a wrong tcc offset on resume
parents 5bb7b210 cf969218

drivers/thermal/intel/int340x_thermal/processor_thermal_device.c

+3 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int tcc_offset_update(unsigned int tcc) 
	return 0;

}



static unsigned int tcc_offset_save;

static int tcc_offset_save = -1;



static ssize_t tcc_offset_degree_celsius_store(struct device *dev,

				struct device_attribute *attr, const char *buf,
@@ -352,6 +352,7 @@ int proc_thermal_resume(struct device *dev) 
	proc_dev = dev_get_drvdata(dev);

	proc_thermal_read_ppcc(proc_dev);



	if (tcc_offset_save >= 0)

		tcc_offset_update(tcc_offset_save);



	return 0;

drivers/thermal/qcom/tsens.c

+2 −2
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static irqreturn_t tsens_critical_irq_thread(int irq, void *data) 
		const struct tsens_sensor *s = &priv->sensor[i];

		u32 hw_id = s->hw_id;



		if (IS_ERR(s->tzd))

		if (!s->tzd)

			continue;

		if (!tsens_threshold_violated(priv, hw_id, &d))

			continue;
@@ -467,7 +467,7 @@ static irqreturn_t tsens_irq_thread(int irq, void *data) 
		const struct tsens_sensor *s = &priv->sensor[i];

		u32 hw_id = s->hw_id;



		if (IS_ERR(s->tzd))

		if (!s->tzd)

			continue;

		if (!tsens_threshold_violated(priv, hw_id, &d))

			continue;

drivers/thermal/thermal_core.c

+3 −4
Original line number Diff line number Diff line
@@ -222,15 +222,14 @@ int thermal_build_list_of_policies(char *buf) 
{

	struct thermal_governor *pos;

	ssize_t count = 0;

	ssize_t size = PAGE_SIZE;



	mutex_lock(&thermal_governor_lock);



	list_for_each_entry(pos, &thermal_governor_list, governor_list) {

		size = PAGE_SIZE - count;

		count += scnprintf(buf + count, size, "%s ", pos->name);

		count += scnprintf(buf + count, PAGE_SIZE - count, "%s ",

				   pos->name);

	}

	count += scnprintf(buf + count, size, "\n");

	count += scnprintf(buf + count, PAGE_SIZE - count, "\n");



	mutex_unlock(&thermal_governor_lock);