From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>,
Mathias Nyman <mathias.nyman@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sasha Levin <sashal@kernel.org>,
linux-usb@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 18/30] usb: host: xhci: mvebu: Iterate over array indexes instead of using pointer math
Date: Fri, 3 Mar 2023 16:47:03 -0500 [thread overview]
Message-ID: <20230303214715.1452256-18-sashal@kernel.org> (raw)
In-Reply-To: <20230303214715.1452256-1-sashal@kernel.org>
From: Kees Cook <keescook@chromium.org>
[ 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 <mathias.nyman@intel.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230204183651.never.663-kees@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 8ca1a235d1645..eabccf25796b2 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
next prev parent reply other threads:[~2023-03-03 21:56 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 21:46 [PATCH AUTOSEL 5.10 01/30] IB/hfi1: Update RMT size calculation Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 02/30] iommu/amd: Fix error handling for pdev_pri_ats_enable() Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 03/30] media: uvcvideo: Handle cameras with invalid descriptors Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 04/30] media: uvcvideo: Handle errors from calls to usb_string Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 05/30] media: uvcvideo: Quirk for autosuspend in Logitech B910 and C910 Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 06/30] media: uvcvideo: Silence memcpy() run-time false positive warnings Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 07/30] staging: emxx_udc: Add checks for dma_alloc_coherent() Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 08/30] tty: fix out-of-bounds access in tty_driver_lookup_tty() Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 09/30] tty: serial: fsl_lpuart: disable the CTS when send break signal Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 10/30] serial: sc16is7xx: setup GPIO controller later in probe Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 11/30] mei: bus-fixup:upon error print return values of send and receive Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 12/30] parport_pc: Set up mode and ECR masks for Oxford Semiconductor devices Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 13/30] tools/iio/iio_utils:fix memory leak Sasha Levin
2023-03-03 21:46 ` [PATCH AUTOSEL 5.10 14/30] iio: accel: mma9551_core: Prevent uninitialized variable in mma9551_read_status_word() Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 15/30] iio: accel: mma9551_core: Prevent uninitialized variable in mma9551_read_config_word() Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 16/30] firmware: coreboot: framebuffer: Ignore reserved pixel color bits Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 17/30] PCI: loongson: Prevent LS7A MRRS increases Sasha Levin
2023-03-03 21:47 ` Sasha Levin [this message]
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 19/30] USB: ene_usb6250: Allocate enough memory for full object Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 20/30] usb: uvc: Enumerate valid values for color matching Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 21/30] usb: gadget: uvc: Make bSourceID read/write Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 22/30] PCI: Align extra resources for hotplug bridges properly Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 23/30] PCI: Take other bus devices into account when distributing resources Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 24/30] kernel/power/energy_model.c: fix memory leak with using debugfs_lookup() Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 25/30] kernel/fail_function: " Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 26/30] PCI: loongson: Add more devices that need MRRS quirk Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 27/30] PCI: Add ACS quirk for Wangxun NICs Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 28/30] phy: rockchip-typec: Fix unsigned comparison with less than zero Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 29/30] soundwire: cadence: Remove wasted space in response_buf Sasha Levin
2023-03-03 21:47 ` [PATCH AUTOSEL 5.10 30/30] soundwire: cadence: Drain the RX FIFO after an IO timeout Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230303214715.1452256-18-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox