]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: ll_temac: Fix missing tx_pending check in ethtools_set_ringparam()
authorAlok Tiwari <alok.a.tiwari@oracle.com>
Thu, 10 Jul 2025 18:06:17 +0000 (11:06 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Jul 2025 16:32:13 +0000 (18:32 +0200)
[ Upstream commit e81750b4e3826fedce7362dad839cb40384d60ae ]

The function ll_temac_ethtools_set_ringparam() incorrectly checked
rx_pending twice, once correctly for RX and once mistakenly in place
of tx_pending. This caused tx_pending to be left unchecked against
TX_BD_NUM_MAX.
As a result, invalid TX ring sizes may have been accepted or valid
ones wrongly rejected based on the RX limit, leading to potential
misconfiguration or unexpected results.

This patch corrects the condition to properly validate tx_pending.

Fixes: f7b261bfc35e ("net: ll_temac: Make RX/TX ring sizes configurable")
Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>
Link: https://patch.msgid.link/20250710180621.2383000-1-alok.a.tiwari@oracle.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/xilinx/ll_temac_main.c

index 08c45756b2181c98d3a739d16bd91915de680030..d9b5c1c6ceaa2517b0cdbcd0adb8ca54e021cf44 100644 (file)
@@ -1311,7 +1311,7 @@ ll_temac_ethtools_set_ringparam(struct net_device *ndev,
        if (ering->rx_pending > RX_BD_NUM_MAX ||
            ering->rx_mini_pending ||
            ering->rx_jumbo_pending ||
-           ering->rx_pending > TX_BD_NUM_MAX)
+           ering->tx_pending > TX_BD_NUM_MAX)
                return -EINVAL;
 
        if (netif_running(ndev))