Commit ef4edb3e authored Feb 22, 2019 by Linus Torvalds

linux-pm

Pull power management fixes from Rafael Wysocki:
 "These fix a regression in the PM-runtime framework introduced by the
  recent switch-over of it to using hrtimers and a use-after-free
  introduced by one of the recent changes in the scmi-cpufreq driver.

  Specifics:

   - Use hrtimer_try_to_cancel() instead of hrtimer_cancel() in the
     PM-runtime framework to avoid a possible timer-related deadlock
     introduced recently (Vincent Guittot).

   - Reorder the scmi-cpufreq driver code to avoid accessing memory that
     has just been freed (Yangtao Li)"

* tag 'pm-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM-runtime: Fix deadlock when canceling hrtimer
  cpufreq: scmi: Fix use-after-free in scmi_cpufreq_exit()

parents 9053d2db 5b317cbf

drivers/base/power/runtime.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ static void __update_runtime_status(struct device *dev, enum rpm_status status)
		static void pm_runtime_deactivate_timer(struct device *dev)
		{
		if (dev->power.timer_expires > 0) {
		hrtimer_cancel(&dev->power.suspend_timer);
		hrtimer_try_to_cancel(&dev->power.suspend_timer);
		dev->power.timer_expires = 0;
		}
		}

drivers/cpufreq/scmi-cpufreq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -187,8 +187,8 @@ static int scmi_cpufreq_exit(struct cpufreq_policy *policy)

		cpufreq_cooling_unregister(priv->cdev);
		dev_pm_opp_free_cpufreq_table(priv->cpu_dev, &policy->freq_table);
		kfree(priv);
		dev_pm_opp_remove_all_dynamic(priv->cpu_dev);
		kfree(priv);

		return 0;
		}