2020-06-24 03:34:14

by Gaurav Singh

Subject: [PATCH] [drivers/x86] fix bound check in pmc_core_mphy_pg_show

Check bounds before accessing map[].

Signed-off-by: Gaurav Singh <[email protected]>
---
drivers/platform/x86/intel_pmc_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 7c8bdab078cf..f571f9cf7217 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -795,7 +795,7 @@ static int pmc_core_mphy_pg_show(struct seq_file *s, void *unused)
msleep(10);
val_high = pmc_core_reg_read(pmcdev, SPT_PMC_MFPMC_OFFSET);

- for (index = 0; map[index].name && index < 8; index++) {
+ for (index = 0; index < 8 && map[index].name; index++) {
seq_printf(s, "%-32s\tState: %s\n",
map[index].name,
map[index].bit_mask & val_low ? "Not power gated" :
--
2.17.1

2020-07-10 20:37:11

by Andy Shevchenko

Subject: Re: [PATCH] [drivers/x86] fix bound check in pmc_core_mphy_pg_show

On Wed, Jun 24, 2020 at 6:31 AM Gaurav Singh <[email protected]> wrote:
>
> Check bounds before accessing map[].
>

Pushed to my review and testing queue, thanks!


> Signed-off-by: Gaurav Singh <[email protected]>
> ---
> drivers/platform/x86/intel_pmc_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
> index 7c8bdab078cf..f571f9cf7217 100644
> --- a/drivers/platform/x86/intel_pmc_core.c
> +++ b/drivers/platform/x86/intel_pmc_core.c
> @@ -795,7 +795,7 @@ static int pmc_core_mphy_pg_show(struct seq_file *s, void *unused)
> msleep(10);
> val_high = pmc_core_reg_read(pmcdev, SPT_PMC_MFPMC_OFFSET);
>
> - for (index = 0; map[index].name && index < 8; index++) {
> + for (index = 0; index < 8 && map[index].name; index++) {
> seq_printf(s, "%-32s\tState: %s\n",
> map[index].name,
> map[index].bit_mask & val_low ? "Not power gated" :
> --
> 2.17.1
>


--
With Best Regards,
Andy Shevchenko