Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

[PATCH] drm/amdgpu: avoid out of bounds access on array interrupt_status_offsets

66 views
Skip to first unread message

Colin King

unread,
Sep 20, 2016, 11:20:07 AM9/20/16
to
From: Colin Ian King <colin...@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...@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)) {
DRM_DEBUG("Unhandled interrupt: %d %d\n", entry->src_id, entry->src_data);
return 0;
}
--
2.9.3

Alex Deucher

unread,
Sep 20, 2016, 11:40:06 AM9/20/16
to
On Tue, Sep 20, 2016 at 11:16 AM, Colin King <colin...@canonical.com> wrote:
> From: Colin Ian King <colin...@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...@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

> DRM_DEBUG("Unhandled interrupt: %d %d\n", entry->src_id, entry->src_data);
> return 0;
> }
> --
> 2.9.3
>
> _______________________________________________
> dri-devel mailing list
> dri-...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Colin Ian King

unread,
Sep 20, 2016, 11:50:05 AM9/20/16
to
On 20/09/16 16:39, Alex Deucher wrote:
> On Tue, Sep 20, 2016 at 11:16 AM, Colin King <colin...@canonical.com> wrote:
>> From: Colin Ian King <colin...@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...@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

Colin King

unread,
Sep 20, 2016, 11:50:05 AM9/20/16
to
From: Colin Ian King <colin...@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 adev->mode_info.num_hpd instead.

Signed-off-by: Colin Ian King <colin...@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 >= adev->mode_info.num_hpd) {

Alex Deucher

unread,
Sep 20, 2016, 12:00:06 PM9/20/16
to
On Tue, Sep 20, 2016 at 11:49 AM, Colin King <colin...@canonical.com> wrote:
> From: Colin Ian King <colin...@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 adev->mode_info.num_hpd instead.
>
> Signed-off-by: Colin Ian King <colin...@canonical.com>

Applied! thanks,

Alex

> ---
> 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 >= adev->mode_info.num_hpd) {
> DRM_DEBUG("Unhandled interrupt: %d %d\n", entry->src_id, entry->src_data);
> return 0;
> }
> --
> 2.9.3
>
0 new messages