Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11709796 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

usb: host: xhci: mvebu: Iterate over array indexes instead of using pointer math 



[ 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: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230204183651.never.663-kees@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f5b76a81

drivers/usb/host/xhci-mvebu.c

+1 −1
Original line number Diff line number Diff line
@@ -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,