* [PATCH] powercap: intel_rapl: Fix off by one in get_rpi()
@ 2024-08-20 8:41 Dan Carpenter
2024-08-20 19:44 ` Rafael J. Wysocki
2024-08-21 1:59 ` Zhang, Rui
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2024-08-20 8:41 UTC (permalink / raw)
To: Zhang Rui; +Cc: Rafael J. Wysocki, linux-pm, linux-kernel, kernel-janitors
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] powercap: intel_rapl: Fix off by one in get_rpi()
2024-08-20 8:41 [PATCH] powercap: intel_rapl: Fix off by one in get_rpi() Dan Carpenter
@ 2024-08-20 19:44 ` Rafael J. Wysocki
2024-08-21 1:59 ` Zhang, Rui
1 sibling, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2024-08-20 19:44 UTC (permalink / raw)
To: Dan Carpenter
Cc: Zhang Rui, Rafael J. Wysocki, linux-pm, linux-kernel, kernel-janitors
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!
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] powercap: intel_rapl: Fix off by one in get_rpi()
2024-08-20 8:41 [PATCH] powercap: intel_rapl: Fix off by one in get_rpi() Dan Carpenter
2024-08-20 19:44 ` Rafael J. Wysocki
@ 2024-08-21 1:59 ` Zhang, Rui
1 sibling, 0 replies; 3+ messages in thread
From: Zhang, Rui @ 2024-08-21 1:59 UTC (permalink / raw)
To: dan.carpenter; +Cc: linux-pm, rafael, linux-kernel, kernel-janitors
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];
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-08-21 1:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-20 8:41 [PATCH] powercap: intel_rapl: Fix off by one in get_rpi() Dan Carpenter
2024-08-20 19:44 ` Rafael J. Wysocki
2024-08-21 1:59 ` Zhang, Rui
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®