lkml.org 
[lkml]   [2023]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 6.2 43/64] usb: host: xhci: mvebu: Iterate over array indexes instead of using pointer math
    Date
    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 60651a50770f9..87f1597a0e5ab 100644
    --- a/drivers/usb/host/xhci-mvebu.c
    +++ b/drivers/usb/host/xhci-mvebu.c
    @@ -32,7 +32,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
    \
     
     \ /
      Last update: 2023-03-27 00:43    [W:4.367 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site