Commit 1270605f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-7.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These fix a potential NULL pointer dereference in the energy model
  netlink interface and a potential double free in an error path in
  the common cpufreq governor management code:

   - Fix a NULL pointer dereference in the energy model netlink
     interface that may occur if a given perf domain ID is not
     recognized (Changwoo Min)

   - Avoid double free in the cpufreq_dbs_governor_init() error
     path when kobject_init_and_add() fails (Guangshuo Li)"

* tag 'pm-7.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: governor: fix double free in cpufreq_dbs_governor_init() error path
  PM: EM: Fix NULL pointer dereference when perf domain ID is not found
parents 576db0f3 744d5721

drivers/cpufreq/cpufreq_governor.c

+3 −3
Original line number Diff line number Diff line
@@ -468,13 +468,13 @@ int cpufreq_dbs_governor_init(struct cpufreq_policy *policy) 
	/* Failure, so roll back. */

	pr_err("initialization failed (dbs_data kobject init error %d)\n", ret);



	kobject_put(&dbs_data->attr_set.kobj);



	policy->governor_data = NULL;



	if (!have_governor_per_policy())

		gov->gdbs_data = NULL;

	gov->exit(dbs_data);



	kobject_put(&dbs_data->attr_set.kobj);

	goto free_policy_dbs_info;



free_dbs_data:

	kfree(dbs_data);

kernel/power/em_netlink.c

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ int dev_energymodel_nl_get_perf_domains_doit(struct sk_buff *skb, 


	id = nla_get_u32(info->attrs[DEV_ENERGYMODEL_A_PERF_DOMAIN_PERF_DOMAIN_ID]);

	pd = em_perf_domain_get_by_id(id);

	if (!pd)

		return -EINVAL;



	__em_nl_get_pd_size(pd, &msg_sz);

	msg = genlmsg_new(msg_sz, GFP_KERNEL);