2019-02-16 09:48:52

by Rajat Jain

Subject: [PATCH] platform/x86: intel_pmc_core: Avoid a u32 overflow

The register (SLP_S0_RES) at offset slp_s0_offset is a 32 bit register.
The pmc_core_adjust_slp_s0_step() could overflow the u32 value while
returning it after adjusting the step. Thus change to u64, this is
already accounted for in debugfs attribute (that wants to output a
64 bit value).

Signed-off-by: Rajat Jain <[email protected]>
---
drivers/platform/x86/intel_pmc_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 22dbf115782e..f90f4dd25151 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -328,9 +328,9 @@ static inline void pmc_core_reg_write(struct pmc_dev *pmcdev, int
writel(val, pmcdev->regbase + reg_offset);
}

-static inline u32 pmc_core_adjust_slp_s0_step(u32 value)
+static inline u64 pmc_core_adjust_slp_s0_step(u32 value)
{
- return value * SPT_PMC_SLP_S0_RES_COUNTER_STEP;
+ return (u64)value * SPT_PMC_SLP_S0_RES_COUNTER_STEP;
}

static int pmc_core_dev_state_get(void *data, u64 *val)
--
2.21.0.rc0.258.g878e2cd30e-goog

2019-02-21 14:25:49

by Andy Shevchenko

Subject: Re: [PATCH] platform/x86: intel_pmc_core: Avoid a u32 overflow

On Sat, Feb 16, 2019 at 2:19 AM Rajat Jain <[email protected]> wrote:
>
> The register (SLP_S0_RES) at offset slp_s0_offset is a 32 bit register.
> The pmc_core_adjust_slp_s0_step() could overflow the u32 value while
> returning it after adjusting the step. Thus change to u64, this is
> already accounted for in debugfs attribute (that wants to output a
> 64 bit value).
>

Pushed to my review and testing queue, thanks!

> Signed-off-by: Rajat Jain <[email protected]>
> ---
> drivers/platform/x86/intel_pmc_core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
> index 22dbf115782e..f90f4dd25151 100644
> --- a/drivers/platform/x86/intel_pmc_core.c
> +++ b/drivers/platform/x86/intel_pmc_core.c
> @@ -328,9 +328,9 @@ static inline void pmc_core_reg_write(struct pmc_dev *pmcdev, int
> writel(val, pmcdev->regbase + reg_offset);
> }
>
> -static inline u32 pmc_core_adjust_slp_s0_step(u32 value)
> +static inline u64 pmc_core_adjust_slp_s0_step(u32 value)
> {
> - return value * SPT_PMC_SLP_S0_RES_COUNTER_STEP;
> + return (u64)value * SPT_PMC_SLP_S0_RES_COUNTER_STEP;
> }
>
> static int pmc_core_dev_state_get(void *data, u64 *val)
> --
> 2.21.0.rc0.258.g878e2cd30e-goog
>


--
With Best Regards,
Andy Shevchenko

2019-02-22 03:41:30

by Bhardwaj, Rajneesh

Subject: Re: [PATCH] platform/x86: intel_pmc_core: Avoid a u32 overflow

On 16-Feb-19 5:49 AM, Rajat Jain wrote:
> The register (SLP_S0_RES) at offset slp_s0_offset is a 32 bit register.
> The pmc_core_adjust_slp_s0_step() could overflow the u32 value while
> returning it after adjusting the step. Thus change to u64, this is
> already accounted for in debugfs attribute (that wants to output a
> 64 bit value).
>
> Signed-off-by: Rajat Jain <[email protected]>

Acked-by: Rajneesh Bhardwaj <[email protected]>

> ---
> drivers/platform/x86/intel_pmc_core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
> index 22dbf115782e..f90f4dd25151 100644
> --- a/drivers/platform/x86/intel_pmc_core.c
> +++ b/drivers/platform/x86/intel_pmc_core.c
> @@ -328,9 +328,9 @@ static inline void pmc_core_reg_write(struct pmc_dev *pmcdev, int
> writel(val, pmcdev->regbase + reg_offset);
> }
>
> -static inline u32 pmc_core_adjust_slp_s0_step(u32 value)
> +static inline u64 pmc_core_adjust_slp_s0_step(u32 value)
> {
> - return value * SPT_PMC_SLP_S0_RES_COUNTER_STEP;
> + return (u64)value * SPT_PMC_SLP_S0_RES_COUNTER_STEP;
> }
>
> static int pmc_core_dev_state_get(void *data, u64 *val)
>
>