Skip to content

Commit 782486a

Browse files
shimodaydavem330
authored andcommitted
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: 33f5d73 ("net: renesas: rswitch: Improve TX timestamp accuracy") Signed-off-by: Yoshihiro Shimoda <[email protected]> Reviewed-by: Wojciech Drewek <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 1aaef86 commit 782486a

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

drivers/net/ethernet/renesas/rswitch.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,10 +1517,8 @@ static netdev_tx_t rswitch_start_xmit(struct sk_buff *skb, struct net_device *nd
15171517
return ret;
15181518

15191519
dma_addr = dma_map_single(ndev->dev.parent, skb->data, skb->len, DMA_TO_DEVICE);
1520-
if (dma_mapping_error(ndev->dev.parent, dma_addr)) {
1521-
dev_kfree_skb_any(skb);
1522-
return ret;
1523-
}
1520+
if (dma_mapping_error(ndev->dev.parent, dma_addr))
1521+
goto err_kfree;
15241522

15251523
gq->skbs[gq->cur] = skb;
15261524
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
15331531
struct rswitch_gwca_ts_info *ts_info;
15341532

15351533
ts_info = kzalloc(sizeof(*ts_info), GFP_ATOMIC);
1536-
if (!ts_info) {
1537-
dma_unmap_single(ndev->dev.parent, dma_addr, skb->len, DMA_TO_DEVICE);
1538-
return ret;
1539-
}
1534+
if (!ts_info)
1535+
goto err_unmap;
15401536

15411537
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
15421538
rdev->ts_tag++;
@@ -1558,6 +1554,14 @@ static netdev_tx_t rswitch_start_xmit(struct sk_buff *skb, struct net_device *nd
15581554
gq->cur = rswitch_next_queue_index(gq, true, 1);
15591555
rswitch_modify(rdev->addr, GWTRC(gq->index), 0, BIT(gq->index % 32));
15601556

1557+
return ret;
1558+
1559+
err_unmap:
1560+
dma_unmap_single(ndev->dev.parent, dma_addr, skb->len, DMA_TO_DEVICE);
1561+
1562+
err_kfree:
1563+
dev_kfree_skb_any(skb);
1564+
15611565
return ret;
15621566
}
15631567

0 commit comments

Comments
 (0)