* [PATCH] drm/amdgpu: avoid out of bounds access on array interrupt_status_offsets
@ 2016-09-20 15:16 Colin King
2016-09-20 15:39 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: Colin King @ 2016-09-20 15:16 UTC (permalink / raw)
To: Alex Deucher, Christian König, David Airlie, Ken Wang,
dri-devel
Cc: linux-kernel
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)) {
DRM_DEBUG("Unhandled interrupt: %d %d\n", entry->src_id, entry->src_data);
return 0;
}
--
2.9.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu: avoid out of bounds access on array interrupt_status_offsets
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
0 siblings, 1 reply; 3+ messages in thread
From: Alex Deucher @ 2016-09-20 15:39 UTC (permalink / raw)
To: Colin King
Cc: LKML, Maling list - DRI developers, Alex Deucher, Ken Wang,
Christian König
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
> 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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu: avoid out of bounds access on array interrupt_status_offsets
2016-09-20 15:39 ` Alex Deucher
@ 2016-09-20 15:41 ` Colin Ian King
0 siblings, 0 replies; 3+ messages in thread
From: Colin Ian King @ 2016-09-20 15:41 UTC (permalink / raw)
To: Alex Deucher
Cc: Alex Deucher, Christian König, David Airlie, Ken Wang,
Maling list - DRI developers, LKML
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-20 15:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox