]> Gentwo Git Trees - linux/.git/commit
net: stmmac: fix rx limit check in stmmac_rx_zc()
authorAlexey Kodanev <aleksei.kodanev@bell-sw.com>
Wed, 26 Nov 2025 10:43:27 +0000 (10:43 +0000)
committerJakub Kicinski <kuba@kernel.org>
Fri, 28 Nov 2025 02:07:30 +0000 (18:07 -0800)
commit8048168df56e225c94e50b04cb7b0514135d7a1c
tree6a3fc0b0291a0ad0f7802749929aa06c14726b93
parentebb2eaeb05d0ee6bd46e98313f72eac2b0dbd9d7
net: stmmac: fix rx limit check in stmmac_rx_zc()

The extra "count >= limit" check in stmmac_rx_zc() is redundant and
has no effect because the value of "count" doesn't change after the
while condition at this point.

However, it can change after "read_again:" label:

        while (count < limit) {
            ...

            if (count >= limit)
                break;
    read_again:
            ...
            /* XSK pool expects RX frame 1:1 mapped to XSK buffer */
            if (likely(status & rx_not_ls)) {
                xsk_buff_free(buf->xdp);
                buf->xdp = NULL;
                dirty++;
                count++;
                goto read_again;
            }
            ...

This patch addresses the same issue previously resolved in stmmac_rx()
by commit fa02de9e7588 ("net: stmmac: fix rx budget limit check").
The fix is the same: move the check after the label to ensure that it
bounds the goto loop.

Fixes: bba2556efad6 ("net: stmmac: Enable RX via AF_XDP zero-copy")
Signed-off-by: Alexey Kodanev <aleksei.kodanev@bell-sw.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/20251126104327.175590-1-aleksei.kodanev@bell-sw.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c