Commit 744d5721 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-em' 

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).

* pm-em:
  PM: EM: Fix NULL pointer dereference when perf domain ID is not found
parents 6dcf9d00 9badc2a8

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);