Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1317139

[PATCH v3] mptlan: add checks for dma mapping errors

Show all headers | View raw

mpt_lan_sdu_send() and mpt_lan_post_receive_buckets() do not check
if mapping dma memory succeed.
The patch adds the checks and failure handling.

v3: Fix resource deallocation (reported by Tomas Henzl).

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

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
---
 drivers/message/fusion/mptlan.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index cbe96072a6cc..e9b83fc7be35 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -734,6 +734,13 @@ mpt_lan_sdu_send (struct sk_buff *skb, struct net_device *dev)
 
         dma = pci_map_single(mpt_dev->pcidev, skb->data, skb->len,
 			     PCI_DMA_TODEVICE);
+	if (pci_dma_mapping_error(mpt_dev->pcidev, dma)) {
+		mpt_put_msg_frame(LanCtx, mpt_dev, mf);
+		netif_stop_queue(dev);
+
+		printk (KERN_ERR "%s: dma mapping failed\n", __func__);
+		return NETDEV_TX_BUSY;
+	}
 
 	priv->SendCtl[ctx].skb = skb;
 	priv->SendCtl[ctx].dma = dma;
@@ -1232,6 +1239,15 @@ mpt_lan_post_receive_buckets(struct mpt_lan_priv *priv)
 
 				dma = pci_map_single(mpt_dev->pcidev, skb->data,
 						     len, PCI_DMA_FROMDEVICE);
+				if (pci_dma_mapping_error(mpt_dev->pcidev, dma)) {
+					printk (KERN_WARNING
+						MYNAM "/%s: dma mapping failed\n",
+						__func__);
+					dev_kfree_skb(skb);
+					priv->mpt_rxfidx[++priv->mpt_rxfidx_tail] = ctx;
+					spin_unlock_irqrestore(&priv->rxfidx_lock, flags);
+					break;
+				}
 
 				priv->RcvCtl[ctx].skb = skb;
 				priv->RcvCtl[ctx].dma = dma;
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2] mptlan: add checks for dma mapping errors Alexey Khoroshilov <khoroshilov@ispras.ru> - 2016-01-23 01:50 +0100
  Re: [PATCH v2] mptlan: add checks for dma mapping errors Tomas Henzl <thenzl@redhat.com> - 2016-01-25 16:40 +0100
    Re: [PATCH v2] mptlan: add checks for dma mapping errors Alexey Khoroshilov <khoroshilov@ispras.ru> - 2016-01-25 18:10 +0100
      [PATCH v3] mptlan: add checks for dma mapping errors Alexey Khoroshilov <khoroshilov@ispras.ru> - 2016-01-25 19:10 +0100
        Re: [PATCH v3] mptlan: add checks for dma mapping errors Tomas Henzl <thenzl@redhat.com> - 2016-01-26 17:40 +0100
          Re: [PATCH v3] mptlan: add checks for dma mapping errors "Martin K. Petersen" <martin.petersen@oracle.com> - 2016-01-27 03:30 +0100
            RE: [PATCH v3] mptlan: add checks for dma mapping errors Sathya Prakash <sathya.prakash@avagotech.com> - 2016-01-27 06:50 +0100
              Re: [PATCH v3] mptlan: add checks for dma mapping errors Tomas Henzl <thenzl@redhat.com> - 2016-01-27 17:20 +0100
                Re: [PATCH v3] mptlan: add checks for dma mapping errors James Bottomley <James.Bottomley@HansenPartnership.com> - 2016-01-27 17:30 +0100

csiph-web