Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp741473pxb; Thu, 31 Mar 2022 16:41:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwixUmWMfwYOCJXM6VONnj+ztO/cumktpXQUP+VH7LWOYwY2RjHl+ce/utV2uY3gufd6NBg X-Received: by 2002:a17:902:bcc6:b0:153:53c2:7e2c with SMTP id o6-20020a170902bcc600b0015353c27e2cmr7596352pls.14.1648770094957; Thu, 31 Mar 2022 16:41:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648770094; cv=none; d=google.com; s=arc-20160816; b=kwj2K78zmn6X87vzqs+q+WwkrFKIaJ4RakUwAhAQBJeEWZB+ovkGNiJovRDieSgnfq CImXOuTF+WqAGCfRRV2K7EFHG61FQI/zBPoR892Un6ibq47UiYSuUfCIpYErDL/oCqTs zrMv7MAilwIi1sdJU7WRFBVuK+plOXv6TdniNueFNHfz+HAYDuPQchyXvxrBUqEq+iI7 k8SEZ41gavqhmE/T7SuhzJebobC4gb/Jyks/wAblNPl2orHWDTCSfvrjBHzOX4wg1yFW 5nSsnM9378AhbHVPOnsb/JLV3R/2XZWTHJcasiA9kexuxWEMefAPCyrsKMtzcvacYNHB 0JMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=8K4qat18oyS/ON0Tc2wg3IJl/20RhGtMMHJnn7j74hI=; b=B+N+c6E5MIjAXckBm5CUAvIDZB0847+efC4GW/hb4ojq7EQK7yu0lBcAClqwhwC9Ax U9vP69svDCnKc1WTN1SjxAgURNUj5WFju5XeY7R8ZVsA6Qm576HkriJBE8wN0TC2NcoR RdneOQ5acbGnrUIvg2E/v4NrA03fBGCzF+VsvOv6JzlE2vKPstJmzL46ziqicw4fvX0e 899wSE7erDRLISLm3JyRJ3Pu8V51h7zr4NWkFOKFSJWSePuUF3cpuNizwP29dUjrn0X1 +9yjZlB8Trs8UkSBNSo37slm1/qPaReOGzOGaImx2UatyoOha1MVQWFzZe45M2HkknF4 WnGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=fu9LzFVA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c14-20020a63ef4e000000b003822b0c2142si847716pgk.279.2022.03.31.16.41.19; Thu, 31 Mar 2022 16:41:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=fu9LzFVA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239019AbiCaTGg (ORCPT + 99 others); Thu, 31 Mar 2022 15:06:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238955AbiCaTGe (ORCPT ); Thu, 31 Mar 2022 15:06:34 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB652215466 for ; Thu, 31 Mar 2022 12:04:46 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id x2so426794plm.7 for ; Thu, 31 Mar 2022 12:04:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8K4qat18oyS/ON0Tc2wg3IJl/20RhGtMMHJnn7j74hI=; b=fu9LzFVAlRADxGRQVppAXuCP8QEOUuMJxhDaoGIzZSn5yF2pGIuxmwhJTWp5woQn4H EHzaLrxIYiJVgpunyLYPv3S9IfZSVNpubgMt/4tO/0lijzJbE1/2ZK2lcEqWyuEedN3T 2+pKK2PG5hJ9rQ1KKpCLZBGkXKvVi+SILZFbU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8K4qat18oyS/ON0Tc2wg3IJl/20RhGtMMHJnn7j74hI=; b=YxJs8CSHZR32C2TAWwD80VjKM+Vbd5FBGKIoNwjbj11Sdx+6zgYfBhrQKS0pnYDoL5 6BzEK3TeF5Qvjby8Zx0Iu383J7xfVxYMk/nAxkriXTcbgrzvj8DE9btTRGnGaEnXBPB3 rwtsg57knkXPaFo82lUoF5Jua9kv+Z2R3eFa6pLhlifHcTan5KwyfXNIDeHePYcc4/V/ z5CumvFOLx7sPEpBQTpoDGdwMD1GgYFM8zK924yhmiW2Yf7HoLmx9kCMmUZcywRKmz99 uraQldreuqD5CC7sMVDsABrJGU0MgtalemR9vEPCsyumAmQDCnrROxuWybZpPjwWY2/C gbBg== X-Gm-Message-State: AOAM532zjWd/iCqpvpYrltefIqoAQ2J5KaFTZudIXsV5tLebuQT+RDMZ 1NnwD3YlHN1qaJHQgQbV7OODtw== X-Received: by 2002:a17:902:d2c6:b0:156:2b2c:ab54 with SMTP id n6-20020a170902d2c600b001562b2cab54mr16131133plc.52.1648753486453; Thu, 31 Mar 2022 12:04:46 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id v22-20020a056a00149600b004fb34a7b500sm196147pfu.203.2022.03.31.12.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 12:04:46 -0700 (PDT) From: Kees Cook To: Liviu Dudau Cc: Kees Cook , Sudeep Holla , Lorenzo Pieralisi , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] ARM: vexpress/spc: Avoid negative array index when !SMP Date: Thu, 31 Mar 2022 12:04:43 -0700 Message-Id: <20220331190443.851661-1-keescook@chromium.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1790; h=from:subject; bh=/2a5CSsipys253M5vGRsqHVDoYM5WGy53UpPjsagOIc=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBiRftKixEnPaz5DYx3KcOYhAntbvuUAggDZhiZY7iw bo/iWgyJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCYkX7SgAKCRCJcvTf3G3AJn1+D/ 9JmnMmf4cTjvYcKaiTm+ZsZZnuFtJXdv4Sj5cEH11WQawVe+UAqmL0m1glp2GYK85YUhuNPWdd/2An 2zH3JiJlWtqNuCF8jHcxmtuSgvUfnipd2s/l5v12j/RyWt7yUJBB/f+RA68i2rAnPTLL+MerHlWtyb PhxoFZjC7hcnw/3gdFHtOQlTC5Z4Lw57BivrJXu7OBCGCFwK2R0ArvLd2alzA8/cOpesKeB1d2y7Ft N7SQIMtttTn1UaqFUxP5fAJbwQVgdvSbig44DEep6jFro3jykxmBiK44bGqIy/SGK3w2gDnRfDJk0S IaqlI3aixjk7Vh1lnsPLB42Bp6enuHtDlrLJejwBs11oBOh3J5fJKEZ0HnXDWQ1/iZsgb7aOpcQWh3 5/R4Di8zHLA4ywpxPYhsNey5F8A4Pf2U/RCo1uIUehCc/cjO6CaoddINTyJJ+Sz7fhjDrbVLLHzg1O AFtV6Wwp2HJv1Dpry96HDj6aDhK74xNllVO22PzFa46p0o4gi7flIyfOK6Mdxz/8UthhjoRXKIcJk1 ewXb0ZYaFh38NvdBpaC0xA193NKbxRb+hlwz21p1+6FreJdjhYMhaR+cYFkUhCVh6dRqUpiw37fYs9 CMKyba1yS3vRZqEXSCU7fAq2QtFHELV0CqQ+URjZHEklvJABZrjanhwsn6fw== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When building multi_v7_defconfig+CONFIG_SMP=n, -Warray-bounds exposes a couple negative array index accesses: arch/arm/mach-vexpress/spc.c: In function 've_spc_clk_init': arch/arm/mach-vexpress/spc.c:583:21: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] 583 | if (init_opp_table[cluster]) | ~~~~~~~~~~~~~~^~~~~~~~~ arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; | ^~~~~~~~~~~~~~ arch/arm/mach-vexpress/spc.c:592:18: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] 592 | init_opp_table[cluster] = true; | ~~~~~~~~~~~~~~^~~~~~~~~ arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; | ^~~~~~~~~~~~~~ Skip this logic when built !SMP. Cc: Liviu Dudau Cc: Sudeep Holla Cc: Lorenzo Pieralisi Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Kees Cook --- arch/arm/mach-vexpress/spc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c index 1da11bdb1dfb..1c6500c4e6a1 100644 --- a/arch/arm/mach-vexpress/spc.c +++ b/arch/arm/mach-vexpress/spc.c @@ -580,7 +580,7 @@ static int __init ve_spc_clk_init(void) } cluster = topology_physical_package_id(cpu_dev->id); - if (init_opp_table[cluster]) + if (cluster < 0 || init_opp_table[cluster]) continue; if (ve_init_opp_table(cpu_dev)) -- 2.32.0