From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3054FC61DA3 for ; Fri, 3 Mar 2023 22:05:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233546AbjCCWFt (ORCPT ); Fri, 3 Mar 2023 17:05:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233682AbjCCWEw (ORCPT ); Fri, 3 Mar 2023 17:04:52 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46BD76A9CF; Fri, 3 Mar 2023 13:54:56 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 08188CE228F; Fri, 3 Mar 2023 21:48:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF2B8C4339C; Fri, 3 Mar 2023 21:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677880118; bh=F+0LBj59X0hOjpv694s9LcOJXwFPeFE9T6E8MQ2JQjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mfVPNLhinooCUVJnhJzMASk+cC35lztBWVOOXvmhJC+redROIzI7hn9QaT0Dxk5tX fC3PtfoBRlGMH9tn4JjgcP7RGh8r0EuNU5gOs1APIByKDRLp6iBLpdZ2mDwyxXJ5qj ZwsAYIEB+nll8a4DF8fjWix5Wr7fIz1Yddy/ad1Z12UwBCtK/1TY5gBCUnpQ3lMC9f P25iVNS0CZqOVPgp4risX/Ahnzp0o2B94Kx0XyQFSMhNyMIB84XlbWZ8r9S6Gj9ZSF bU05yNoeqC3SXY5kXfBQlfoG1v84Xm0xexRwGkPoccwR7QCVRJygehCPHq65kVjxCE XCPFC/ThmSznA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kees Cook , Mathias Nyman , Greg Kroah-Hartman , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 15/20] usb: host: xhci: mvebu: Iterate over array indexes instead of using pointer math Date: Fri, 3 Mar 2023 16:48:01 -0500 Message-Id: <20230303214806.1453287-15-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230303214806.1453287-1-sashal@kernel.org> References: <20230303214806.1453287-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kees Cook [ Upstream commit 0fbd2cda92cdb00f72080665554a586f88bca821 ] Walking the dram->cs array was seen as accesses beyond the first array item by the compiler. Instead, use the array index directly. This allows for run-time bounds checking under CONFIG_UBSAN_BOUNDS as well. Seen with GCC 13 with -fstrict-flex-arrays: In function 'xhci_mvebu_mbus_config', inlined from 'xhci_mvebu_mbus_init_quirk' at ../drivers/usb/host/xhci-mvebu.c:66:2: ../drivers/usb/host/xhci-mvebu.c:37:28: warning: array subscript 0 is outside array bounds of 'const struct mbus_dram_window[0]' [-Warray-bounds=] 37 | writel(((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) | | ~~^~~~~~ Cc: Mathias Nyman Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/20230204183651.never.663-kees@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/host/xhci-mvebu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index f27d5c2c42f31..bb70dcc2f84f4 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -33,7 +33,7 @@ static void xhci_mvebu_mbus_config(void __iomem *base, /* Program each DRAM CS in a seperate window */ for (win = 0; win < dram->num_cs; win++) { - const struct mbus_dram_window *cs = dram->cs + win; + const struct mbus_dram_window *cs = &dram->cs[win]; writel(((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) | (dram->mbus_dram_target_id << 4) | 1, -- 2.39.2