]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
powercap: intel_rapl: Fix off by one in get_rpi()
authorDan Carpenter <dan.carpenter@linaro.org>
Tue, 20 Aug 2024 08:41:34 +0000 (11:41 +0300)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 21 Aug 2024 10:59:55 +0000 (12:59 +0200)
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>
Link: https://patch.msgid.link/86e3a059-504d-4795-a5ea-4a653f3b41f8@stanley.mountain
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/powercap/intel_rapl_common.c

index d110c5da5cfeb33867ff19e11451bcca89591feb..a63a4f04063e5b5315466e0f5dce430a4ec7af7b 100644 (file)
@@ -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];