From patchwork Fri Oct 5 16:15:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10628457 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 3B39215E2 for ; Fri, 5 Oct 2018 16:29:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DC4029A06 for ; Fri, 5 Oct 2018 16:29:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17BF329A0F; Fri, 5 Oct 2018 16:29:20 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A822329A06 for ; Fri, 5 Oct 2018 16:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=X4Kif9l6wRkmJGortMuyRB1W+AfJHZX5guGAf5avHJ4=; b=rc9 whDlg5iPB1xNwo6SF8R15esJL011M0VcE/2ECX5uWIQ+GQGy8CS7O5zwbJmKeOQztawG/lXs1WebR xgPzCJsbBCTtfTGWAUbo0wFqmfodNj+1n4Z/e66kzT5VUErpAycNCFWgMrbK/7aLXRgilqxMPkWB/ OT/3PDlZ1YsAiefXJCvyTqYg3XOs6iW4t1Sy3CRQSBspgNZcmqH8Sy5ZFqQ5aXfbXbfO8VuKWGaOJ eNHrHWqmpKZq0LVRv2QTeqvwknJOU7DYGovEXZ9Mc67K3fM02kE90L/lz1m+0AmCKh2YBK17Peg3P 6GoSx3mRDdLPty+qpKZE7ff6KpJhDIQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8Syb-0002lq-0p; Fri, 05 Oct 2018 16:29:17 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g8SyX-0002lC-0i for linux-arm-kernel@lists.infradead.org; Fri, 05 Oct 2018 16:29:14 +0000 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MG90u-1fwP1z0jdM-00Gb7M; Fri, 05 Oct 2018 18:16:03 +0200 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1MG90u-1fwP1z0jdM-00Gb7M; Fri, 05 Oct 2018 18:16:03 +0200 From: Arnd Bergmann To: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement Subject: [PATCH] ARM: orion: avoid VLA in orion_mpp_conf Date: Fri, 5 Oct 2018 18:15:49 +0200 Message-Id: <20181005161601.875388-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:2J/zK62TPNTB0ahRQmIca9GLKOzjXrCwYVcsu0M78+iM1YVeqZm P+G/VC7j0rRsgxwlMCBxrxEfO9EUD8IEsh3OvoW+3yo+y70cZwf06CCAObvl3vyduSNMhqd 5DEsEnlzt0zbrg51JV4UeiXQ5Ibs8t3eLOGePxZz7cLqhWo9coBQ1G8Fe+UaTMPVnGeCCQl SKEZnPQ2kT1PD2D9hxB5g== X-UI-Out-Filterresults: notjunk:1;V01:K0:GSLjpz0nIvA=:22SunAqeeX7s57xNizj4w0 +vskotoFJgiUKAgrD4pRwFCD46jTQ96GyIfBkHFeM3F9pQlLIXT/w7BJ/mqzu1GBul2VLTqK6 QkZEHwKDXkfqQOGlgJ5oXSnLgfUPrmY/aTpNFLFOs24HyI5uXeND6I8RGW/XsKoDuJ6leM/7B WOlNkw2SWwZvt4o3syqhVTKqh6XAUbJBhJ4VDqAWyytqrRQQ8Byfub+Gr82/I3e5Gd2GZ228M 0RugZaKpBa3tuPoXzJp/6AaRwZvEyOU7WKgQqRETPlZiwCnQCX0XwvX63qGksQObFGe4R65o3 uXMkLZmQH3lyXkL2ENNorBQ5yw1ifZ7G5kaRNqJMfFbwEmBwBDEFZLHd/91ENBXe7wsasLV9h UMQvFvctEe+l9H/9UKfj+PQseibmT+8SQ9L3VBypz1kfyKGGxzuMJBA/HqGsGp+qkCwcj914U RqtfaQ3PlULUX5d8hTyRyOZ1wJa1SccUVSB6wf35PX2GAINxCDHzs56tTXYYOVCGXQ2ecbCPk Wavsof2m9SdpDbpezpyDc4UALG1ClN7xn6b7tbX4LxiBFOJY5YW868UG3hQ3tly9k9PgrzW5x c05cBZd4jbCj2CKuZ3ILwjo3IKqdTx/UPI1d2XvHXLq+jxBXpZj1XKySIMbe5flZxwClAqHBj TqhfzILvOzEzY/gCiq5IJGYFADOFzL50fScz57vlFyBJCFud/dRJMm7fgurWDiqbZEtA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181005_092913_362417_F117507E X-CRM114-Status: GOOD ( 11.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Kees Cook , Arnd Bergmann , linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Testing randconfig builds found an instance of a VLA that was missed when determining that we have removed them all: arch/arm/plat-orion/mpp.c: In function 'orion_mpp_conf': arch/arm/plat-orion/mpp.c:31:2: error: ISO C90 forbids variable length array 'mpp_ctrl' [-Werror=vla] This one is fairly straightforward: we know what all three callers are, and the maximum length is not very long. Fixes: 68664695ae57 ("Makefile: Globally enable VLA warning") Cc: Kees Cook Signed-off-by: Arnd Bergmann Reviewed-by: Kees Cook --- arch/arm/plat-orion/mpp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/plat-orion/mpp.c b/arch/arm/plat-orion/mpp.c index 5b4ff9373c89..8a6880d528b6 100644 --- a/arch/arm/plat-orion/mpp.c +++ b/arch/arm/plat-orion/mpp.c @@ -28,10 +28,15 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask, unsigned int mpp_max, void __iomem *dev_bus) { unsigned int mpp_nr_regs = (1 + mpp_max/8); - u32 mpp_ctrl[mpp_nr_regs]; + u32 mpp_ctrl[8]; int i; printk(KERN_DEBUG "initial MPP regs:"); + if (mpp_nr_regs > ARRAY_SIZE(mpp_ctrl)) { + printk(KERN_ERR "orion_mpp_conf: invalid mpp_max\n"); + return; + } + for (i = 0; i < mpp_nr_regs; i++) { mpp_ctrl[i] = readl(mpp_ctrl_addr(i, dev_bus)); printk(" %08x", mpp_ctrl[i]);