Commit 7ea6cd16 authored by Aleksander Jan Bajkowski's avatar Aleksander Jan Bajkowski Committed by David S. Miller
Browse files

lantiq: net: fix duplicated skb in rx descriptor ring 



The previous commit didn't fix the bug properly. By mistake, it replaces
the pointer of the next skb in the descriptor ring instead of the current
one. As a result, the two descriptors are assigned the same SKB. The error
is seen during the iperf test when skb_put tries to insert a second packet
and exceeds the available buffer.

Fixes: c7718ee9 ("net: lantiq: fix memory corruption in RX ring ")
Signed-off-by: default avatarAleksander Jan Bajkowski <olek2@wp.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 057d4933

drivers/net/ethernet/lantiq_xrx200.c

+2 −1
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static int xrx200_close(struct net_device *net_dev) 


static int xrx200_alloc_skb(struct xrx200_chan *ch)

{

	struct sk_buff *skb = ch->skb[ch->dma.desc];

	dma_addr_t mapping;

	int ret = 0;
@@ -168,6 +169,7 @@ static int xrx200_alloc_skb(struct xrx200_chan *ch) 
				 XRX200_DMA_DATA_LEN, DMA_FROM_DEVICE);

	if (unlikely(dma_mapping_error(ch->priv->dev, mapping))) {

		dev_kfree_skb_any(ch->skb[ch->dma.desc]);

		ch->skb[ch->dma.desc] = skb;

		ret = -ENOMEM;

		goto skip;

	}
@@ -198,7 +200,6 @@ static int xrx200_hw_receive(struct xrx200_chan *ch) 
	ch->dma.desc %= LTQ_DESC_NUM;



	if (ret) {

		ch->skb[ch->dma.desc] = skb;

		net_dev->stats.rx_dropped++;

		netdev_err(net_dev, "failed to allocate new rx buffer\n");

		return ret;