]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
net: macb: add check for dma mapping error in start_xmit()
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Fri, 18 Nov 2016 22:40:10 +0000 (01:40 +0300)
committerDavid S. Miller <davem@davemloft.net>
Sat, 19 Nov 2016 15:29:49 +0000 (10:29 -0500)
at91ether_start_xmit() does not check for dma mapping errors.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/macb.c

index b32444a3ed79d311fc4047aa10eabc5f630b66cb..533653bd7aec99781af410a6c10be47d2ffc6fc0 100644 (file)
@@ -2673,6 +2673,12 @@ static int at91ether_start_xmit(struct sk_buff *skb, struct net_device *dev)
                lp->skb_length = skb->len;
                lp->skb_physaddr = dma_map_single(NULL, skb->data, skb->len,
                                                        DMA_TO_DEVICE);
+               if (dma_mapping_error(NULL, lp->skb_physaddr)) {
+                       dev_kfree_skb_any(skb);
+                       dev->stats.tx_dropped++;
+                       netdev_err(dev, "%s: DMA mapping error\n", __func__);
+                       return NETDEV_TX_OK;
+               }
 
                /* Set address of the data in the Transmit Address register */
                macb_writel(lp, TAR, lp->skb_physaddr);