]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: xilinx: axienet: Fix IRQ coalescing packet count overflow
authorSean Anderson <sean.anderson@linux.dev>
Mon, 13 Jan 2025 16:30:00 +0000 (11:30 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jan 2025 16:15:59 +0000 (17:15 +0100)
[ Upstream commit c17ff476f53afb30f90bb3c2af77de069c81a622 ]

If coalesce_count is greater than 255 it will not fit in the register and
will overflow. This can be reproduced by running

    # ethtool -C ethX rx-frames 256

which will result in a timeout of 0us instead. Fix this by checking for
invalid values and reporting an error.

Fixes: 8a3b7a252dca ("drivers/net/ethernet/xilinx: added Xilinx AXI Ethernet driver")
Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
Reviewed-by: Shannon Nelson <shannon.nelson@amd.com>
Reviewed-by: Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>
Link: https://patch.msgid.link/20250113163001.2335235-1-sean.anderson@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/xilinx/xilinx_axienet_main.c

index 56a970357f450dde0e401c57561d1c8544c24b2e..f63d2224ba91ac4d5be6075fd668881bcad27811 100644 (file)
@@ -1584,6 +1584,12 @@ axienet_ethtools_set_coalesce(struct net_device *ndev,
                return -EFAULT;
        }
 
+       if (ecoalesce->rx_max_coalesced_frames > 255 ||
+           ecoalesce->tx_max_coalesced_frames > 255) {
+               NL_SET_ERR_MSG(extack, "frames must be less than 256");
+               return -EINVAL;
+       }
+
        if (ecoalesce->rx_max_coalesced_frames)
                lp->coalesce_count_rx = ecoalesce->rx_max_coalesced_frames;
        if (ecoalesce->rx_coalesce_usecs)