octeontx2-pf: fix "UBSAN: shift-out-of-bounds error"

[ Upstream commit 85f4b0c650d9f9db10bda8d3acfa1af83bf78cf7 ]

This patch ensures that the RX ring size (rx_pending) is not
set below the permitted length. This avoids UBSAN
shift-out-of-bounds errors when users passes small or zero
ring sizes via ethtool -G.

Fixes: d45d8979840d ("octeontx2-pf: Add basic ethtool support")
Signed-off-by: Anshumali Gaur <agaur@marvell.com>
Link: https://patch.msgid.link/20251219062226.524844-1-agaur@marvell.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
index db4a9fc399f3fe18d30e4879c9f997ce4eb80de1..e0c108d48d2e603652a80afffe411e6243453150 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
@@ -391,6 +391,14 @@ static int otx2_set_ringparam(struct net_device *netdev,
         */
        if (rx_count < pfvf->hw.rq_skid)
                rx_count =  pfvf->hw.rq_skid;
+
+       if (ring->rx_pending < 16) {
+               netdev_err(netdev,
+                          "rx ring size %u invalid, min is 16\n",
+                          ring->rx_pending);
+               return -EINVAL;
+       }
+
        rx_count = Q_COUNT(Q_SIZE(rx_count, 3));
 
        /* Due pipelining impact minimum 2000 unused SQ CQE's