* [PATCH next] powercap: intel_rapl: Change an error pointer to NULL
@ 2024-08-23 12:51 Dan Carpenter
2024-08-23 13:47 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2024-08-23 12:51 UTC (permalink / raw)
To: Dhananjay Ugwekar
Cc: Rafael J. Wysocki, Zhang Rui, linux-pm, linux-kernel, kernel-janitors
The rapl_find_package_domain_cpuslocked() function is supposed to
return NULL on error. This new error patch returns ERR_PTR(-EINVAL) but
none of the callers check for that so it would lead to an Oops.
Fixes: 26096aed255f ("powercap/intel_rapl: Fix the energy-pkg event for AMD CPUs")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/powercap/intel_rapl_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index d110c5da5cfe..2881687d7900 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -2157,7 +2157,7 @@ struct rapl_package *rapl_find_package_domain_cpuslocked(int id, struct rapl_if_
topology_physical_package_id(id) : topology_logical_die_id(id);
if (uid < 0) {
pr_err("topology_logical_(package/die)_id() returned a negative value");
- return ERR_PTR(-EINVAL);
+ return NULL;
}
}
else
--
2.43.0
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH next] powercap: intel_rapl: Change an error pointer to NULL
2024-08-23 12:51 [PATCH next] powercap: intel_rapl: Change an error pointer to NULL Dan Carpenter
@ 2024-08-23 13:47 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2024-08-23 13:47 UTC (permalink / raw)
To: Dan Carpenter
Cc: Dhananjay Ugwekar, Rafael J. Wysocki, Zhang Rui, linux-pm,
linux-kernel, kernel-janitors
On Fri, Aug 23, 2024 at 2:51 PM Dan Carpenter <dan.carpenter@linaro.org> wrote:
>
> The rapl_find_package_domain_cpuslocked() function is supposed to
> return NULL on error. This new error patch returns ERR_PTR(-EINVAL) but
> none of the callers check for that so it would lead to an Oops.
>
> Fixes: 26096aed255f ("powercap/intel_rapl: Fix the energy-pkg event for AMD CPUs")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> drivers/powercap/intel_rapl_common.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
> index d110c5da5cfe..2881687d7900 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -2157,7 +2157,7 @@ struct rapl_package *rapl_find_package_domain_cpuslocked(int id, struct rapl_if_
> topology_physical_package_id(id) : topology_logical_die_id(id);
> if (uid < 0) {
> pr_err("topology_logical_(package/die)_id() returned a negative value");
> - return ERR_PTR(-EINVAL);
> + return NULL;
> }
> }
> else
> --
Applied, thank you!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-08-23 13:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-23 12:51 [PATCH next] powercap: intel_rapl: Change an error pointer to NULL Dan Carpenter
2024-08-23 13:47 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®