diff options
| author | Esben Haabendal <esben@geanix.com> | 2021-06-18 12:52:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-23 14:41:30 +0200 |
| commit | b6c0ab11c88fb016bfc85fa4f6f878f5f4263646 (patch) | |
| tree | caa82f9e30d8c92e0230156f9fb115d74c188783 | |
| parent | 6d120ab4dc39a543c6b63361e1d0541c382900a3 (diff) | |
| download | linux-b6c0ab11c88fb016bfc85fa4f6f878f5f4263646.tar.gz linux-b6c0ab11c88fb016bfc85fa4f6f878f5f4263646.tar.bz2 linux-b6c0ab11c88fb016bfc85fa4f6f878f5f4263646.zip | |
net: ll_temac: Fix TX BD buffer overwrite
commit c364df2489b8ef2f5e3159b1dff1ff1fdb16040d upstream.
Just as the initial check, we need to ensure num_frag+1 buffers available,
as that is the number of buffers we are going to use.
This fixes a buffer overflow, which might be seen during heavy network
load. Complete lockup of TEMAC was reproducible within about 10 minutes of
a particular load.
Fixes: 84823ff80f74 ("net: ll_temac: Fix race condition causing TX hang")
Cc: stable@vger.kernel.org # v5.4+
Signed-off-by: Esben Haabendal <esben@geanix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/xilinx/ll_temac_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index d4b7e95a81ba..9b55fbdc3a7c 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -846,7 +846,7 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) smp_mb(); /* Space might have just been freed - check again */ - if (temac_check_tx_bd_space(lp, num_frag)) + if (temac_check_tx_bd_space(lp, num_frag + 1)) return NETDEV_TX_BUSY; netif_wake_queue(ndev); |