[PATCH] ipw2x00: add checks for dma mapping errors

[Alexey Khoroshilov]

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

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

Signed-off-by: Alexey Khoroshilov 
---
 drivers/net/wireless/ipw2x00/ipw2100.c | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c 
b/drivers/net/wireless/ipw2x00/ipw2100.c
index 36818c7f30b9..f93a7f71c047 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -2311,8 +2311,10 @@ static int ipw2100_alloc_skb(struct ipw2100_priv *priv,
packet->dma_addr = pci_map_single(priv->pci_dev, packet->skb->data,
  sizeof(struct ipw2100_rx),
  PCI_DMA_FROMDEVICE);
-   /* NOTE: pci_map_single does not return an error code, and 0 is a valid
-*   dma_addr */
+   if (pci_dma_mapping_error(priv->pci_dev, packet->dma_addr)) {
+   dev_kfree_skb(packet->skb);
+   return -ENOMEM;
+   }
 
return 0;
 }
@@ -3183,6 +3185,11 @@ static void ipw2100_tx_send_data(struct ipw2100_priv 
*priv)
LIBIPW_3ADDR_LEN,
tbd->buf_length,
PCI_DMA_TODEVICE);
+   if (pci_dma_mapping_error(priv->pci_dev,
+ tbd->host_addr)) {
+   IPW_DEBUG_TX("dma mapping error\n");
+   break;
+   }
 
IPW_DEBUG_TX("data frag tbd TX%d P=%08x L=%d\n",
 txq->next, tbd->host_addr,
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] ipw2x00: add checks for dma mapping errors

[Alexey Khoroshilov]

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

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

Signed-off-by: Alexey Khoroshilov 
---
 drivers/net/wireless/ipw2x00/ipw2100.c | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c 
b/drivers/net/wireless/ipw2x00/ipw2100.c
index 36818c7f30b9..f93a7f71c047 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -2311,8 +2311,10 @@ static int ipw2100_alloc_skb(struct ipw2100_priv *priv,
packet->dma_addr = pci_map_single(priv->pci_dev, packet->skb->data,
  sizeof(struct ipw2100_rx),
  PCI_DMA_FROMDEVICE);
-   /* NOTE: pci_map_single does not return an error code, and 0 is a valid
-*   dma_addr */
+   if (pci_dma_mapping_error(priv->pci_dev, packet->dma_addr)) {
+   dev_kfree_skb(packet->skb);
+   return -ENOMEM;
+   }
 
return 0;
 }
@@ -3183,6 +3185,11 @@ static void ipw2100_tx_send_data(struct ipw2100_priv 
*priv)
LIBIPW_3ADDR_LEN,
tbd->buf_length,
PCI_DMA_TODEVICE);
+   if (pci_dma_mapping_error(priv->pci_dev,
+ tbd->host_addr)) {
+   IPW_DEBUG_TX("dma mapping error\n");
+   break;
+   }
 
IPW_DEBUG_TX("data frag tbd TX%d P=%08x L=%d\n",
 txq->next, tbd->host_addr,
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/