From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750950AbeELLM0 (ORCPT ); Sat, 12 May 2018 07:12:26 -0400 Received: from mail-vk0-f65.google.com ([209.85.213.65]:38028 "EHLO mail-vk0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750735AbeELLMY (ORCPT ); Sat, 12 May 2018 07:12:24 -0400 X-Google-Smtp-Source: AB8JxZpGLPoaBVg8tzZsOp8Oq7ogEEnRVkyAzZ9NGYfIQpIGUaam31nz90xmg+q0Gr3HuEE95n44E+AGjqLdiYWrrzk= MIME-Version: 1.0 In-Reply-To: References: <20180413212412.18205-1-labbott@redhat.com> From: Oded Gabbay Date: Sat, 12 May 2018 14:11:53 +0300 Message-ID: Subject: Re: [PATCHv3] drm/amdkfd: Remove vla To: Kees Cook Cc: Laura Abbott , Alex Deucher , =?UTF-8?Q?Christian_K=C3=B6nig?= , "David (ChunMing) Zhou" , Felix Kuehling , David Airlie , Maling list - DRI developers , amd-gfx list , LKML , Kernel Hardening Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id w4CBCWxO028149 On Thu, May 3, 2018 at 12:49 AM, Kees Cook wrote: > On Fri, Apr 13, 2018 at 2:24 PM, Laura Abbott wrote: >> >> There's an ongoing effort to remove VLAs[1] from the kernel to eventually >> turn on -Wvla. Switch to a constant value that covers all hardware. >> >> [1] https://lkml.org/lkml/2018/3/7/621 >> >> Reviewed-by: Felix Kuehling >> Acked-by: Christian König >> Signed-off-by: Laura Abbott > > Friendly ping -- I don't see this in -next yet. Oded, does this look > okay to apply? > > Thanks! > > -Kees Thanks! Applied to amdkfd-next Oded > >> --- >> v3: Introduced a #define for the max value, switched to pr_err_once to >> avoid log flood, switched to sizeof(array) per private suggestion. >> --- >> drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 8 +++++--- >> drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 ++ >> 2 files changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c b/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c >> index 035c351f47c5..db6d9336b80d 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c >> @@ -139,10 +139,12 @@ static void interrupt_wq(struct work_struct *work) >> { >> struct kfd_dev *dev = container_of(work, struct kfd_dev, >> interrupt_work); >> + uint32_t ih_ring_entry[KFD_MAX_RING_ENTRY_SIZE]; >> >> - uint32_t ih_ring_entry[DIV_ROUND_UP( >> - dev->device_info->ih_ring_entry_size, >> - sizeof(uint32_t))]; >> + if (dev->device_info->ih_ring_entry_size > sizeof(ih_ring_entry)) { >> + dev_err_once(kfd_chardev(), "Ring entry too small\n"); >> + return; >> + } >> >> while (dequeue_ih_ring_entry(dev, ih_ring_entry)) >> dev->device_info->event_interrupt_class->interrupt_wq(dev, >> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h >> index 96a9cc0f02c9..a90db05dfe61 100644 >> --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h >> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h >> @@ -39,6 +39,8 @@ >> >> #include "amd_shared.h" >> >> +#define KFD_MAX_RING_ENTRY_SIZE 8 >> + >> #define KFD_SYSFS_FILE_MODE 0444 >> >> #define KFD_MMAP_DOORBELL_MASK 0x8000000000000ull >> -- >> 2.14.3 >> > > > > -- > Kees Cook > Pixel Security