From patchwork Tue Aug 7 22:50:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10559297 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2E0BD139A for ; Tue, 7 Aug 2018 22:50:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14B8E2A76A for ; Tue, 7 Aug 2018 22:50:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08CC32A7BD; Tue, 7 Aug 2018 22:50:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A51942A75D for ; Tue, 7 Aug 2018 22:50:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726982AbeHHBHT (ORCPT ); Tue, 7 Aug 2018 21:07:19 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:42975 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726902AbeHHBHS (ORCPT ); Tue, 7 Aug 2018 21:07:18 -0400 Received: by mail-pg1-f194.google.com with SMTP id y4-v6so117104pgp.9 for ; Tue, 07 Aug 2018 15:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=+cGKSWAfCBOTI6zwyjBdUsVLrQ5UA9JbG4VoiJAv538=; b=JJK6YIFSD2/ec0MQMPqPtS6/V/R1voFTdvSEU2rrlusX8OBR2KT/C01sXovtRp1LNV PR2DaNYWhTgG8qXSmzV0zmpmqtXzNue56gpCx+BQ6fNTVBXsCdONaHIMk+XRndvAP1HT aE6/W6B+MDvt8IDdCkOIF9DJjZFexTmY6lWYw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=+cGKSWAfCBOTI6zwyjBdUsVLrQ5UA9JbG4VoiJAv538=; b=k3euTEiM+aLBwUudCBts4fW2H1FfmrQkoUmOjAcYUVugNBZVMWF4P1gF6FjxmXMtbu +Z0oAZl/AGOEgAZqrjCrH1A763g6lfLrwiRuk8+6ugiHpb6DCTXtmZGBEPSHsUfHDjUZ p2qYyX2Gx1Sufh2RcE9zkdyQ3VEuQYcTBTSIXM7X81pbQJGH7Qr9AOOvEaQmrpixRvdS 05WP1YTFqYLI7sDmsqUgqwEZg0x7fQDJ35yBq0vTNdPvrvytKKwUEiVSwMMUGvVrzPc9 z2p2rungr3BSA7cI7DrK5EjAO21bY7jG4Bkbtx3cCVloxoi4/2ahf6n3j2K7+rv+/vcl 5B0g== X-Gm-Message-State: AOUpUlHf6o/b/grQoWy0z74qh5UIBQLPErP88yeYBjnkc9hH5LsB+Bpn S1fAWp/QRERs3xpoLszy6nrgXgVj1jE= X-Google-Smtp-Source: AA+uWPy/4Luz7s++bC3Ql8r81IV6QQganoMRGBNNSzJnaSe+qiAuyPepfMUqW5brVZmHpmEqCV3j2w== X-Received: by 2002:a63:a502:: with SMTP id n2-v6mr228345pgf.263.1533682242311; Tue, 07 Aug 2018 15:50:42 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id l70-v6sm3471570pge.64.2018.08.07.15.50.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Aug 2018 15:50:41 -0700 (PDT) Date: Tue, 7 Aug 2018 15:50:40 -0700 From: Kees Cook To: Kalle Valo Cc: Stanislaw Gruszka , "David S. Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH wireless-drivers] mt76x0: Remove VLA usage Message-ID: <20180807225040.GA2164@beast> MIME-Version: 1.0 Content-Disposition: inline Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Even with "const" variables, the compiler will generate warnings about VLA usage. In the quest to remove all VLAs from the kernel[1], this uses a #define instead of a const to do the array sizing. [1] https://lkml.kernel.org/r/CA+55aFzCG-zNmZwX4A2FQpadafLfEzK6CC=qPXydAacU1RqZWA@mail.gmail.com Fixes: e87b5039511a ("mt76x0: eeprom files") Signed-off-by: Kees Cook Acked-by: Stanislaw Gruszka --- Please include this for the v4.19 merge window. The VLA was introduced with the new source file (which I also note is missing a SPDX line), so I'd like to avoid the kernel ever getting released with a VLA here. --- drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c index 1ecd018f12b8..af2fd6a1bb44 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c @@ -81,15 +81,15 @@ mt76x0_efuse_read(struct mt76x0_dev *dev, u16 addr, u8 *data, return 0; } +#define MT_MAP_READS DIV_ROUND_UP(MT_EFUSE_USAGE_MAP_SIZE, 16) static int mt76x0_efuse_physical_size_check(struct mt76x0_dev *dev) { - const int map_reads = DIV_ROUND_UP(MT_EFUSE_USAGE_MAP_SIZE, 16); - u8 data[map_reads * 16]; + u8 data[MT_MAP_READS * 16]; int ret, i; u32 start = 0, end = 0, cnt_free; - for (i = 0; i < map_reads; i++) { + for (i = 0; i < MT_MAP_READS; i++) { ret = mt76x0_efuse_read(dev, MT_EE_USAGE_MAP_START + i * 16, data + i * 16, MT_EE_PHYSICAL_READ); if (ret)