]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: ethernet: mtk_eth_soc: fix off by one check of ARRAY_SIZE
authorTom Rix <trix@redhat.com>
Sat, 16 Jul 2022 21:46:54 +0000 (17:46 -0400)
committerJakub Kicinski <kuba@kernel.org>
Tue, 19 Jul 2022 03:12:04 +0000 (20:12 -0700)
In mtk_wed_tx_ring_setup(.., int idx, ..), idx is used as an index here
  struct mtk_wed_ring *ring = &dev->tx_ring[idx];

The bounds of idx are checked here
  BUG_ON(idx > ARRAY_SIZE(dev->tx_ring));

If idx is the size of the array, it will pass this check and overflow.
So change the check to >= .

Fixes: 92f3c8732ac9 ("net: ethernet: mtk_eth_soc: add support for Wireless Ethernet Dispatch (WED)")
Signed-off-by: Tom Rix <trix@redhat.com>
Link: https://lore.kernel.org/r/20220716214654.1540240-1-trix@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mediatek/mtk_wed.c

index 8f0cd3196aacffedf6f59957fdd131e7ddb6e305..29be2fcafea3bc3907fe5b90a8bdb6e7e3997578 100644 (file)
@@ -651,7 +651,7 @@ mtk_wed_tx_ring_setup(struct mtk_wed_device *dev, int idx, void __iomem *regs)
         * WDMA RX.
         */
 
-       BUG_ON(idx > ARRAY_SIZE(dev->tx_ring));
+       BUG_ON(idx >= ARRAY_SIZE(dev->tx_ring));
 
        if (mtk_wed_ring_alloc(dev, ring, MTK_WED_TX_RING_SIZE))
                return -ENOMEM;