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 50B4EC61DA4 for ; Fri, 3 Mar 2023 22:54:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231838AbjCCWyi (ORCPT ); Fri, 3 Mar 2023 17:54:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232572AbjCCWya (ORCPT ); Fri, 3 Mar 2023 17:54:30 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9F5326598; Fri, 3 Mar 2023 14:53:53 -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 ams.source.kernel.org (Postfix) with ESMTPS id 5C142B81A2C; Fri, 3 Mar 2023 21:49:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 097F1C433D2; Fri, 3 Mar 2023 21:49:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677880168; bh=DOJb9D9BCzW3Ov2ZRHdmfpQJEmbgq9MfKARRJQ76lqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y/krJJFyHGc4/hyJpXAc1MjRnYg8rKLYGdBDiBGuH+x5HDgeWOrJmo4kwi+kPxEN9 R2GXihCz6HV9AEz5gwjaznLfDIuKmuEmQqLi/PWCaHBA9Ssqz6Ck7jgy7w5KKguuvT ReNUEs86lj4If88AXM8/C4EKuP14FUZb32rKWJAnWbsXG3jTYw4udAexcotSPsVJKm orl7GfmuOk4cMtXq92dqZt/RQEt3858mLaNNAo1VvH3Xo7CjH6+Ex9OIYT13SRUJ7r 1V3oBYp4FvNIgKUI6n8OCOQjbeBWv/EyVPFeqmDkCmd8y1bkjSbAJLpDuOacTvHA0U /D7hvOJy9+WHg== 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 4.19 13/16] usb: host: xhci: mvebu: Iterate over array indexes instead of using pointer math Date: Fri, 3 Mar 2023 16:48:46 -0500 Message-Id: <20230303214849.1454002-13-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230303214849.1454002-1-sashal@kernel.org> References: <20230303214849.1454002-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: stable@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 32e1585687885..fc9d6189c310f 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -31,7 +31,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