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

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

Posted by Anshumali Gaur 1 month, 2 weeks ago

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>
Change-Id: I6de6770dbc0dd952725ccd71ce521f801bc7b15b
---
 drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
index b90e23dc49de..b6449f0a9e7d 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
@@ -418,6 +418,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
-- 
2.25.1

Re: [PATCH] octeontx2-pf: fix "UBSAN: shift-out-of-bounds error"

Posted by Paolo Abeni 1 month, 1 week ago


On 12/19/25 7:22 AM, Anshumali Gaur wrote:
> 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>
> Change-Id: I6de6770dbc0dd952725ccd71ce521f801bc7b15b

Please strip the above tag in future submissions.

Thanks,

Paolo