* [PATCH] ACPI: CPPC: Add NULL pointer check to cppc_get_perf()
@ 2021-11-18 13:33 Rafael J. Wysocki
2021-11-18 13:37 ` [PATCH v2] " Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2021-11-18 13:33 UTC (permalink / raw)
To: Linux ACPI; +Cc: LKML, Linux PM, Srinivas Pandruvada, Kai-Heng Feng
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Check cpc_desc against NULL in cppc_get_perf(), so it doesn't crash
down the road if cpc_desc is NULL.
Fixes: 0654cf05d17b ("ACPI: CPPC: Introduce cppc_get_nominal_perf()")
Reported-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 5.15+ <stable@vger.kernel.org> # 5.15+
---
drivers/acpi/cppc_acpi.c | 5 +++++
1 file changed, 5 insertions(+)
Index: linux-pm/drivers/acpi/cppc_acpi.c
===================================================================
--- linux-pm.orig/drivers/acpi/cppc_acpi.c
+++ linux-pm/drivers/acpi/cppc_acpi.c
@@ -1000,6 +1000,11 @@ static int cppc_get_perf(int cpunum, enu
struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpunum);
struct cpc_register_resource *reg = &cpc_desc->cpc_regs[reg_idx];
+ if (!cpc_desc) {
+ pr_debug("No CPC descriptor for CPU:%d\n", cpunum);
+ return -ENODEV;
+ }
+
if (CPC_IN_PCC(reg)) {
int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpunum);
struct cppc_pcc_data *pcc_ss_data = NULL;
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH v2] ACPI: CPPC: Add NULL pointer check to cppc_get_perf()
2021-11-18 13:33 [PATCH] ACPI: CPPC: Add NULL pointer check to cppc_get_perf() Rafael J. Wysocki
@ 2021-11-18 13:37 ` Rafael J. Wysocki
2021-11-24 7:46 ` Kai-Heng Feng
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2021-11-18 13:37 UTC (permalink / raw)
To: Linux ACPI; +Cc: LKML, Linux PM, Srinivas Pandruvada, Kai-Heng Feng
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Subject: [PATCH] ACPI: CPPC: Add NULL pointer check to cppc_get_perf()
Check cpc_desc against NULL in cppc_get_perf(), so it doesn't crash
down the road if cpc_desc is NULL.
Fixes: 0654cf05d17b ("ACPI: CPPC: Introduce cppc_get_nominal_perf()")
Reported-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: 5.15+ <stable@vger.kernel.org> # 5.15+
---
-> v2: Check cpc_desc against NULL before using it to initialize reg.
---
drivers/acpi/cppc_acpi.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
Index: linux-pm/drivers/acpi/cppc_acpi.c
===================================================================
--- linux-pm.orig/drivers/acpi/cppc_acpi.c
+++ linux-pm/drivers/acpi/cppc_acpi.c
@@ -998,7 +998,14 @@ static int cpc_write(int cpu, struct cpc
static int cppc_get_perf(int cpunum, enum cppc_regs reg_idx, u64 *perf)
{
struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpunum);
- struct cpc_register_resource *reg = &cpc_desc->cpc_regs[reg_idx];
+ struct cpc_register_resource *reg;
+
+ if (!cpc_desc) {
+ pr_debug("No CPC descriptor for CPU:%d\n", cpunum);
+ return -ENODEV;
+ }
+
+ reg = &cpc_desc->cpc_regs[reg_idx];
if (CPC_IN_PCC(reg)) {
int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpunum);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] ACPI: CPPC: Add NULL pointer check to cppc_get_perf()
2021-11-18 13:37 ` [PATCH v2] " Rafael J. Wysocki
@ 2021-11-24 7:46 ` Kai-Heng Feng
0 siblings, 0 replies; 3+ messages in thread
From: Kai-Heng Feng @ 2021-11-24 7:46 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux ACPI, LKML, Linux PM, Srinivas Pandruvada
On Thu, Nov 18, 2021 at 9:37 PM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Subject: [PATCH] ACPI: CPPC: Add NULL pointer check to cppc_get_perf()
>
> Check cpc_desc against NULL in cppc_get_perf(), so it doesn't crash
> down the road if cpc_desc is NULL.
>
> Fixes: 0654cf05d17b ("ACPI: CPPC: Introduce cppc_get_nominal_perf()")
> Reported-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Cc: 5.15+ <stable@vger.kernel.org> # 5.15+
Sorry for the late test, I bricked my previous ADL rig.
Tested-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> ---
>
> -> v2: Check cpc_desc against NULL before using it to initialize reg.
>
> ---
> drivers/acpi/cppc_acpi.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> Index: linux-pm/drivers/acpi/cppc_acpi.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/cppc_acpi.c
> +++ linux-pm/drivers/acpi/cppc_acpi.c
> @@ -998,7 +998,14 @@ static int cpc_write(int cpu, struct cpc
> static int cppc_get_perf(int cpunum, enum cppc_regs reg_idx, u64 *perf)
> {
> struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpunum);
> - struct cpc_register_resource *reg = &cpc_desc->cpc_regs[reg_idx];
> + struct cpc_register_resource *reg;
> +
> + if (!cpc_desc) {
> + pr_debug("No CPC descriptor for CPU:%d\n", cpunum);
> + return -ENODEV;
> + }
> +
> + reg = &cpc_desc->cpc_regs[reg_idx];
>
> if (CPC_IN_PCC(reg)) {
> int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpunum);
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-11-24 7:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-18 13:33 [PATCH] ACPI: CPPC: Add NULL pointer check to cppc_get_perf() Rafael J. Wysocki
2021-11-18 13:37 ` [PATCH v2] " Rafael J. Wysocki
2021-11-24 7:46 ` Kai-Heng Feng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).