summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2026-04-03 14:15:06 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2026-04-03 14:15:06 +0200
commit744d5721d2d7abc84e5131c16002039c53465c89 (patch)
treececd1cad41fefb8ac1843ada0f665a46bdf4adfe
parent6dcf9d0064ce2f3e3dfe5755f98b93abe6a98e1e (diff)
parent9badc2a84e688be1275bb740942d5f6f51746908 (diff)
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
-rw-r--r--kernel/power/em_netlink.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/power/em_netlink.c b/kernel/power/em_netlink.c
index 5a611d3950fd..4d4fd29bd2be 100644
--- a/kernel/power/em_netlink.c
+++ b/kernel/power/em_netlink.c
@@ -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);