]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
rtl8180: Add error check for pci_map_single return value in TX path
authorandrea.merello <andrea.merello@gmail.com>
Wed, 5 Feb 2014 21:38:06 +0000 (22:38 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Feb 2014 19:35:53 +0000 (14:35 -0500)
Orignal code will not detect a DMA mapping failure, causing the HW
to attempt a DMA from an invalid address.

This patch add the error check and eventually simply drops the TX
packet if we can't map it for DMA.

Signed-off-by: andrea merello <andrea.merello@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rtl818x/rtl8180/dev.c

index fad616a0fa37e0aaa3b7f70577aa77b9df341ec0..3867d1470b36aef5664bcab74e85f38702c8315d 100644 (file)
@@ -276,6 +276,13 @@ static void rtl8180_tx(struct ieee80211_hw *dev,
        mapping = pci_map_single(priv->pdev, skb->data,
                                 skb->len, PCI_DMA_TODEVICE);
 
+       if (pci_dma_mapping_error(priv->pdev, mapping)) {
+               kfree_skb(skb);
+               dev_err(&priv->pdev->dev, "TX DMA mapping error\n");
+               return;
+
+       }
+
        tx_flags = RTL818X_TX_DESC_FLAG_OWN | RTL818X_TX_DESC_FLAG_FS |
                   RTL818X_TX_DESC_FLAG_LS |
                   (ieee80211_get_tx_rate(dev, info)->hw_value << 24) |