powercap: intel_rapl: Fix off by one in get_rpi()

[PATCH] powercap: intel_rapl: Fix off by one in get_rpi()

Posted by Dan Carpenter 1 year, 5 months ago

The rp->priv->rpi array is either rpi_msr or rpi_tpmi which have
NR_RAPL_PRIMITIVES number of elements.  Thus the > needs to be >=
to prevent an off by one access.

Fixes: 98ff639a7289 ("powercap: intel_rapl: Support per Interface primitive information")
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 8b7a5a31e8c1..67aec73511a7 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -740,7 +740,7 @@ static struct rapl_primitive_info *get_rpi(struct rapl_package *rp, int prim)
 {
 	struct rapl_primitive_info *rpi = rp->priv->rpi;
 
-	if (prim < 0 || prim > NR_RAPL_PRIMITIVES || !rpi)
+	if (prim < 0 || prim >= NR_RAPL_PRIMITIVES || !rpi)
 		return NULL;
 
 	return &rpi[prim];
-- 
2.43.0

Re: [PATCH] powercap: intel_rapl: Fix off by one in get_rpi()

Posted by Zhang, Rui 1 year, 5 months ago

On Tue, 2024-08-20 at 11:41 +0300, Dan Carpenter wrote:
> The rp->priv->rpi array is either rpi_msr or rpi_tpmi which have
> NR_RAPL_PRIMITIVES number of elements.  Thus the > needs to be >=
> to prevent an off by one access.
> 
> Fixes: 98ff639a7289 ("powercap: intel_rapl: Support per Interface
> primitive information")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>

Acked-by: Zhang Rui <rui.zhang@intel.com>

thanks,
rui

> ---
>  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 8b7a5a31e8c1..67aec73511a7 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -740,7 +740,7 @@ static struct rapl_primitive_info *get_rpi(struct
> rapl_package *rp, int prim)
>  {
>         struct rapl_primitive_info *rpi = rp->priv->rpi;
>  
> -       if (prim < 0 || prim > NR_RAPL_PRIMITIVES || !rpi)
> +       if (prim < 0 || prim >= NR_RAPL_PRIMITIVES || !rpi)
>                 return NULL;
>  
>         return &rpi[prim];

Re: [PATCH] powercap: intel_rapl: Fix off by one in get_rpi()

Posted by Rafael J. Wysocki 1 year, 5 months ago

On Tue, Aug 20, 2024 at 10:41 AM Dan Carpenter <dan.carpenter@linaro.org> wrote:
>
> The rp->priv->rpi array is either rpi_msr or rpi_tpmi which have
> NR_RAPL_PRIMITIVES number of elements.  Thus the > needs to be >=
> to prevent an off by one access.
>
> Fixes: 98ff639a7289 ("powercap: intel_rapl: Support per Interface primitive information")
> 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 8b7a5a31e8c1..67aec73511a7 100644
> --- a/drivers/powercap/intel_rapl_common.c
> +++ b/drivers/powercap/intel_rapl_common.c
> @@ -740,7 +740,7 @@ static struct rapl_primitive_info *get_rpi(struct rapl_package *rp, int prim)
>  {
>         struct rapl_primitive_info *rpi = rp->priv->rpi;
>
> -       if (prim < 0 || prim > NR_RAPL_PRIMITIVES || !rpi)
> +       if (prim < 0 || prim >= NR_RAPL_PRIMITIVES || !rpi)
>                 return NULL;
>
>         return &rpi[prim];
> --

Applied as 6.12 material, thanks!