提交 c364df24 编写于 作者: E Esben Haabendal 提交者: David S. Miller

net: ll_temac: Fix TX BD buffer overwrite

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: 84823ff8 ("net: ll_temac: Fix race condition causing TX hang")
Cc: stable@vger.kernel.org # v5.4+
Signed-off-by: NEsben Haabendal <esben@geanix.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 28d9fab4
...@@ -861,7 +861,7 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev) ...@@ -861,7 +861,7 @@ temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
smp_mb(); smp_mb();
/* Space might have just been freed - check again */ /* 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; return NETDEV_TX_BUSY;
netif_wake_queue(ndev); netif_wake_queue(ndev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册