From: Colin Ian King <colin.king@canonical.com>
To: Alex Deucher <alexdeucher@gmail.com>
Cc: "Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David Airlie" <airlied@linux.ie>,
"Ken Wang" <Qingqing.Wang@amd.com>,
"Maling list - DRI developers" <dri-devel@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] drm/amdgpu: avoid out of bounds access on array interrupt_status_offsets
Date: Tue, 20 Sep 2016 16:41:40 +0100 [thread overview]
Message-ID: <57E158B4.7090802@canonical.com> (raw)
In-Reply-To: <CADnq5_OxGDpC_go8t2Mt36jqcFKBWt0K=p9qRPxRmneWvz+N=g@mail.gmail.com>
On 20/09/16 16:39, Alex Deucher wrote:
> On Tue, Sep 20, 2016 at 11:16 AM, Colin King <colin.king@canonical.com> wrote:
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> The check for an out of bound index into array interrupt_status_offsets
>> is off-by-one. Fix this and also don't compared to a hard coded array
>> size but use ARRAY_SIZE instead.
>>
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
>> index d3512f3..4ce4c1a 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
>> @@ -2782,7 +2782,7 @@ static int dce_v6_0_hpd_irq(struct amdgpu_device *adev,
>> uint32_t disp_int, mask, int_control, tmp;
>> unsigned hpd;
>>
>> - if (entry->src_data > 6) {
>> + if (entry->src_data >= ARRAY_SIZE(interrupt_status_offsets)) {
>
> This should actually be adev->mode_info.num_hpd as some asic variants
> may not have 6 hpd lines. Thanks for catching this.
>
> Alex
Ah, that's a better way, so:
if (entry->src_data >= adev->mode_info.num_hpd) {
...
I'll send V2
>
>> DRM_DEBUG("Unhandled interrupt: %d %d\n", entry->src_id, entry->src_data);
>> return 0;
>> }
>> --
>> 2.9.3
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2016-09-20 15:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 15:16 [PATCH] drm/amdgpu: avoid out of bounds access on array interrupt_status_offsets Colin King
2016-09-20 15:39 ` Alex Deucher
2016-09-20 15:41 ` Colin Ian King [this message]
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=57E158B4.7090802@canonical.com \
--to=colin.king@canonical.com \
--cc=Qingqing.Wang@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=alexdeucher@gmail.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox