Commit 782486af authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by David S. Miller
Browse files

net: rswitch: Fix missing dev_kfree_skb_any() in error path 



Before returning the rswitch_start_xmit() in the error path,
dev_kfree_skb_any() should be called. So, fix it.

Fixes: 33f5d733 ("net: renesas: rswitch: Improve TX timestamp accuracy")
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1aaef863

drivers/net/ethernet/renesas/rswitch.c

+12 −8
Original line number Diff line number Diff line
@@ -1517,10 +1517,8 @@ static netdev_tx_t rswitch_start_xmit(struct sk_buff *skb, struct net_device *nd 
		return ret;



	dma_addr = dma_map_single(ndev->dev.parent, skb->data, skb->len, DMA_TO_DEVICE);

	if (dma_mapping_error(ndev->dev.parent, dma_addr)) {

		dev_kfree_skb_any(skb);

		return ret;

	}

	if (dma_mapping_error(ndev->dev.parent, dma_addr))

		goto err_kfree;



	gq->skbs[gq->cur] = skb;

	desc = &gq->tx_ring[gq->cur];
@@ -1533,10 +1531,8 @@ static netdev_tx_t rswitch_start_xmit(struct sk_buff *skb, struct net_device *nd 
		struct rswitch_gwca_ts_info *ts_info;



		ts_info = kzalloc(sizeof(*ts_info), GFP_ATOMIC);

		if (!ts_info) {

			dma_unmap_single(ndev->dev.parent, dma_addr, skb->len, DMA_TO_DEVICE);

			return ret;

		}

		if (!ts_info)

			goto err_unmap;



		skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;

		rdev->ts_tag++;
@@ -1558,6 +1554,14 @@ static netdev_tx_t rswitch_start_xmit(struct sk_buff *skb, struct net_device *nd 
	gq->cur = rswitch_next_queue_index(gq, true, 1);

	rswitch_modify(rdev->addr, GWTRC(gq->index), 0, BIT(gq->index % 32));



	return ret;



err_unmap:

	dma_unmap_single(ndev->dev.parent, dma_addr, skb->len, DMA_TO_DEVICE);



err_kfree:

	dev_kfree_skb_any(skb);



	return ret;

}