All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <christian.koenig@amd.com>
To: Dan Carpenter <dan.carpenter@oracle.com>, walter harms <wharms@bfs.de>
Cc: Alex Deucher <alexander.deucher@amd.com>,
	Eric Huang <JinHuiEric.Huang@amd.com>,
	David Airlie <airlied@linux.ie>, Jammy Zhou <Jammy.Zhou@amd.com>,
	Rex Zhu <Rex.Zhu@amd.com>,
	Harry Wentland <harry.wentland@amd.com>,
	dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch] drm/amdgpu: missing bounds check in amdgpu_set_pp_force_state()
Date: Thu, 16 Jun 2016 07:58:16 +0000	[thread overview]
Message-ID: <57625C18.2020208@amd.com> (raw)
In-Reply-To: <20160616075410.GH32247@mwanda>

Am 16.06.2016 um 09:54 schrieb Dan Carpenter:
> On Thu, Jun 16, 2016 at 09:26:03AM +0200, walter harms wrote:
>>
>> Am 16.06.2016 08:41, schrieb Dan Carpenter:
>>> There is no limit on high "idx" can go.  It should be less than
>>> ARRAY_SIZE(data.states) which is 16.
>>>
>>> The "data" variable wasn't declared in that scope so I shifted the code
>>> around a bit to make it work.
>>>
>>> Fixes: f3898ea12fc1 ('drm/amd/powerplay: add some sysfs interfaces for powerplay.')
>>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
>>> index 589b36e..ce9e97f 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
>>> @@ -275,25 +275,23 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,
>>>   
>>>   	if (strlen(buf) = 1)
>>>   		adev->pp_force_state_enabled = false;
>>> -	else {
>>> -		ret = kstrtol(buf, 0, &idx);
>>> +	else if (adev->pp_enabled) {
>>> +		struct pp_states_info data;
>>>   
>>> -		if (ret) {
>>> +		ret = kstrtol(buf, 0, &idx);
>>> +		if (ret || idx >= ARRAY_SIZE(data.states)) {
>>>   			count = -EINVAL;
>>>   			goto fail;
>>>   		}
>>
>> i would also expect a check idx < 0, does it mean this can not happen ?
>> otherwise maybe kstrtoul is a solution ?
> The original code could underflow, but my code can't.  ARRAY_SIZE()
> means the comparison is type promoted to size_t which is unsigned long.

That's probably true, but not very obvious (not that I understand much 
of the power related code anyway).

Using kstrtoul() in the first place would make it a bit less obscure and 
probably generate a nice error code when somebody really tries to use a 
negative index here.

Cheers,
Christian.

> regards,
> dan carpenter
>


WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <christian.koenig@amd.com>
To: Dan Carpenter <dan.carpenter@oracle.com>, walter harms <wharms@bfs.de>
Cc: Alex Deucher <alexander.deucher@amd.com>,
	Eric Huang <JinHuiEric.Huang@amd.com>,
	David Airlie <airlied@linux.ie>, Jammy Zhou <Jammy.Zhou@amd.com>,
	Rex Zhu <Rex.Zhu@amd.com>,
	Harry Wentland <harry.wentland@amd.com>,
	dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch] drm/amdgpu: missing bounds check in amdgpu_set_pp_force_state()
Date: Thu, 16 Jun 2016 09:58:16 +0200	[thread overview]
Message-ID: <57625C18.2020208@amd.com> (raw)
In-Reply-To: <20160616075410.GH32247@mwanda>

Am 16.06.2016 um 09:54 schrieb Dan Carpenter:
> On Thu, Jun 16, 2016 at 09:26:03AM +0200, walter harms wrote:
>>
>> Am 16.06.2016 08:41, schrieb Dan Carpenter:
>>> There is no limit on high "idx" can go.  It should be less than
>>> ARRAY_SIZE(data.states) which is 16.
>>>
>>> The "data" variable wasn't declared in that scope so I shifted the code
>>> around a bit to make it work.
>>>
>>> Fixes: f3898ea12fc1 ('drm/amd/powerplay: add some sysfs interfaces for powerplay.')
>>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
>>> index 589b36e..ce9e97f 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
>>> @@ -275,25 +275,23 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,
>>>   
>>>   	if (strlen(buf) == 1)
>>>   		adev->pp_force_state_enabled = false;
>>> -	else {
>>> -		ret = kstrtol(buf, 0, &idx);
>>> +	else if (adev->pp_enabled) {
>>> +		struct pp_states_info data;
>>>   
>>> -		if (ret) {
>>> +		ret = kstrtol(buf, 0, &idx);
>>> +		if (ret || idx >= ARRAY_SIZE(data.states)) {
>>>   			count = -EINVAL;
>>>   			goto fail;
>>>   		}
>>
>> i would also expect a check idx < 0, does it mean this can not happen ?
>> otherwise maybe kstrtoul is a solution ?
> The original code could underflow, but my code can't.  ARRAY_SIZE()
> means the comparison is type promoted to size_t which is unsigned long.

That's probably true, but not very obvious (not that I understand much 
of the power related code anyway).

Using kstrtoul() in the first place would make it a bit less obscure and 
probably generate a nice error code when somebody really tries to use a 
negative index here.

Cheers,
Christian.

> regards,
> dan carpenter
>


  reply	other threads:[~2016-06-16  7:58 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-16  6:41 [patch] drm/amdgpu: missing bounds check in amdgpu_set_pp_force_state() Dan Carpenter
2016-06-16  6:41 ` Dan Carpenter
2016-06-16  7:26 ` walter harms
2016-06-16  7:26   ` walter harms
2016-06-16  7:54   ` Dan Carpenter
2016-06-16  7:54     ` Dan Carpenter
2016-06-16  7:58     ` Christian König [this message]
2016-06-16  7:58       ` Christian König
2016-06-16  8:09       ` Dan Carpenter
2016-06-16  8:09         ` Dan Carpenter
2016-06-16  8:30         ` [patch v2] " Dan Carpenter
2016-06-16  8:30           ` Dan Carpenter
2016-06-16  8:39           ` Christian König
2016-06-16  8:39             ` Christian König
2016-06-17 16:34             ` Alex Deucher
2016-06-17 16:34               ` Alex Deucher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=57625C18.2020208@amd.com \
    --to=christian.koenig@amd.com \
    --cc=Jammy.Zhou@amd.com \
    --cc=JinHuiEric.Huang@amd.com \
    --cc=Rex.Zhu@amd.com \
    --cc=airlied@linux.ie \
    --cc=alexander.deucher@amd.com \
    --cc=dan.carpenter@oracle.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=harry.wentland@amd.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=wharms@bfs.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.