Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <9a4660438e0466c04880fad4450215707921521e.camel@linux.intel.com>
Subject: Re: [PATCH] thermal: intel_powerclamp: Check for a possible array
 out of bounds access.
From:   srinivas pandruvada <srinivas.pandruvada@linux.intel.com>
To:     "Rafael J. Wysocki" <rafael@kernel.org>,
        Daniil Dulov <d.dulov@aladdin.ru>,
        Zhang Rui <rui.zhang@intel.com>
Cc:     Daniel Lezcano <daniel.lezcano@linaro.org>,
        Amit Kucheria <amitk@kernel.org>,
        Chen Yu <yu.c.chen@intel.com>,
        Jacob Pan <jacob.jun.pan@linux.intel.com>,
        linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
        lvc-project@linuxtesting.org
Date:   Mon, 05 Jun 2023 09:36:54 -0700
In-Reply-To: <CAJZ5v0iyDvApQVjY=BopVSXZSg3tqmcYBnDQN2HORp3Oy8atEQ@mail.gmail.com>
References: <20230602085546.376086-1-d.dulov@aladdin.ru>
         <CAJZ5v0iyDvApQVjY=BopVSXZSg3tqmcYBnDQN2HORp3Oy8atEQ@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4-0ubuntu1 
MIME-Version: 1.0
Precedence: bulk

On Sun, 2023-06-04 at 18:13 +0200, Rafael J. Wysocki wrote:
> Cc list trimmed.
>=20
> On Fri, Jun 2, 2023 at 11:12=E2=80=AFAM Daniil Dulov <d.dulov@aladdin.ru>
> wrote:
> >=20
> > ratio may be equal to MAX_TARGET_RATIO - 1 that will result in
> > out of bound access.
> >=20
The description was not clear to me.

May be something like this:

"
The max value of "ratio" parameter passed to the function
get_compensation() is MAX_TARGET_RATIO - 1. The size of cal_data array
is MAX_TARGET_RATIO. Hence, accessing cal_data[ratio + 1], will result
in out of bound access.

Add a condition to check ratio < MAX_TARGET_RATIO - 1, before accsssing
cal_data[ratio + 1].
"

The change is correct. But for actual code change,
the ratio < MAX_TARGET_RATIO - 1 is also checked in else if() before,
which can be merged to check only once for this condition.

Thanks,
Srinivas


> > Found by Linux Verification Center (linuxtesting.org) with SVACE.
> >=20
> > Fixes: d6d71ee4a14a ("PM: Introduce Intel PowerClamp Driver")
> > Signed-off-by: Daniil Dulov <d.dulov@aladdin.ru>
> > ---
> > =C2=A0drivers/thermal/intel/intel_powerclamp.c | 3 ++-
> > =C2=A01 file changed, 2 insertions(+), 1 deletion(-)
> >=20
> > diff --git a/drivers/thermal/intel/intel_powerclamp.c
> > b/drivers/thermal/intel/intel_powerclamp.c
> > index fb04470d7d4b..9deaf2b8ccf6 100644
> > --- a/drivers/thermal/intel/intel_powerclamp.c
> > +++ b/drivers/thermal/intel/intel_powerclamp.c
> > @@ -277,7 +277,8 @@ static unsigned int get_compensation(int ratio)
> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0 comp =3D (cal_data[ratio].steady_comp +
> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cal_d=
ata[ratio - 1].steady_comp +
> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cal_d=
ata[ratio - 2].steady_comp) / 3;
> > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } else if (cal_data[ratio].confid=
ence >=3D CONFIDENCE_OK &&

I think the concern is that cal_data[ratio + 1] is going out of bound
for the "ratio" passed to this function, when ratio =3D=3D
ARRAY_SIZE(cal_data) - 1;

Here size of cal_data array is 50. The max possible "ratio" passed can
be 49.


> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } else if (ratio < MAX_TARGET_RAT=
IO - 1 &&
> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0 cal_data[ratio].confidence >=3D CONFIDENCE_OK &&
> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0 cal_data[ratio - 1].confidence >=3D CONFIDENCE_OK &&
> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0 cal_data[ratio + 1].confidence >=3D CONFIDENCE_OK) {
> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0 comp =3D (cal_data[ratio].steady_comp +
> > --
>=20
> Rui, Srinivas, can you have a look at this, please?