From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755134AbcITPlo (ORCPT ); Tue, 20 Sep 2016 11:41:44 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:56546 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754599AbcITPln (ORCPT ); Tue, 20 Sep 2016 11:41:43 -0400 Subject: Re: [PATCH] drm/amdgpu: avoid out of bounds access on array interrupt_status_offsets To: Alex Deucher References: <20160920151612.22249-1-colin.king@canonical.com> Cc: Alex Deucher , =?UTF-8?Q?Christian_K=c3=b6nig?= , David Airlie , Ken Wang , Maling list - DRI developers , LKML From: Colin Ian King Message-ID: <57E158B4.7090802@canonical.com> Date: Tue, 20 Sep 2016 16:41:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/09/16 16:39, Alex Deucher wrote: > On Tue, Sep 20, 2016 at 11:16 AM, Colin King wrote: >> From: Colin Ian King >> >> 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 >> --- >> 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