From: Elazar Leibovich <elazarl@gmail.com>
To: linux-pm@vger.kernel.org
Cc: "Rafael J . Wysocki" <rafael@kernel.org>,
Daniel Lezcano <daniel.lezcano@kernel.org>,
linux-kernel@vger.kernel.org,
Sivan Zohar-Kotzer <sivany32@gmail.com>,
Elazar Leibovich <elazarl@gmail.com>
Subject: [PATCH 2/2] powercap: dtpm_devfreq: Guard em_pd_get() against NULL return in callbacks
Date: Thu, 11 Jun 2026 23:46:58 +0300 [thread overview]
Message-ID: <20260611204658.47987-3-elazarl@gmail.com> (raw)
In-Reply-To: <20260611204658.47987-1-elazarl@gmail.com>
From: Sivan Zohar-Kotzer <sivany32@gmail.com>
em_pd_get() returns NULL when the device has no energy model
registered. All three dtpm callbacks dereference the perf domain
without checking it:
1. set_pd_power_limit() — reachable from sysfs via the powercap
constraint power_limit_uw store path. If NULL, return the current
power limit unchanged (no-op) instead of crashing.
2. get_pd_power_uw() — reachable from sysfs via the power_uw read
path. Return 0 if the EM is absent.
3. update_pd_power_uw() — called via dtpm_update_power(). Return
-EINVAL if the EM is absent.
This mirrors the equivalent NULL checks in dtpm_cpu.c.
Note this only handles the case where the EM is already gone (or was
never registered) when the callback starts. A callback racing with
em_dev_unregister_perf_domain() can still observe a non-NULL perf
domain that is freed underneath it; closing that race requires
lifetime guarantees from the EM core and is addressed separately.
Fixes: e44655617317 ("powercap/drivers/dtpm: Add dtpm devfreq with energy model support")
Signed-off-by: Sivan Zohar-Kotzer <sivany32@gmail.com>
Co-developed-by: Elazar Leibovich <elazarl@gmail.com>
Signed-off-by: Elazar Leibovich <elazarl@gmail.com>
---
drivers/powercap/dtpm_devfreq.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/powercap/dtpm_devfreq.c b/drivers/powercap/dtpm_devfreq.c
index d1dff6ccab12..cf16e2756481 100644
--- a/drivers/powercap/dtpm_devfreq.c
+++ b/drivers/powercap/dtpm_devfreq.c
@@ -39,6 +39,9 @@ static int update_pd_power_uw(struct dtpm *dtpm)
struct em_perf_domain *pd = em_pd_get(dev);
struct em_perf_state *table;
+ if (!pd)
+ return -EINVAL;
+
rcu_read_lock();
table = em_perf_state_from_pd(pd);
@@ -60,6 +63,9 @@ static u64 set_pd_power_limit(struct dtpm *dtpm, u64 power_limit)
unsigned long freq;
int i;
+ if (!pd)
+ return dtpm->power_limit;
+
rcu_read_lock();
table = em_perf_state_from_pd(pd);
for (i = 0; i < pd->nr_perf_states; i++) {
@@ -102,6 +108,9 @@ static u64 get_pd_power_uw(struct dtpm *dtpm)
u64 power = 0;
int i;
+ if (!pd)
+ return 0;
+
mutex_lock(&devfreq->lock);
status = devfreq->last_status;
mutex_unlock(&devfreq->lock);
--
2.50.1 (Apple Git-155)
prev parent reply other threads:[~2026-06-11 20:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-11 20:46 [PATCH 0/2] powercap: dtpm: Guard against missing energy model in dtpm callbacks Elazar Leibovich
2026-06-11 20:46 ` [PATCH 1/2] powercap: dtpm_cpu: Guard em_cpu_get() against NULL return in sysfs callbacks Elazar Leibovich
2026-06-11 20:46 ` Elazar Leibovich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260611204658.47987-3-elazarl@gmail.com \
--to=elazarl@gmail.com \
--cc=daniel.lezcano@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=sivany32@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox