diff options
| author | Tina Johnson <tinajohnson.1234@gmail.com> | 2014-11-20 15:54:54 +0530 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-21 15:03:40 -0500 |
| commit | 541675580ffcd098d746f7f713c7dbcc86744925 (patch) | |
| tree | ee5f271c7fcaa51073bea01e02d1c435906978df /drivers/atm | |
| parent | 49ed2617a06abacaccd46fa88ae14c333baa15f0 (diff) | |
| download | op-kernel-dev-541675580ffcd098d746f7f713c7dbcc86744925.zip op-kernel-dev-541675580ffcd098d746f7f713c7dbcc86744925.tar.gz | |
drivers: atm: eni: Add pci_dma_mapping_error() call
Added a pci_dma_mapping_error() call to check for mapping errors before
further using the dma handle. In case of error, control goes to a new label
where the incoming skb is freed. Unchecked dma handles were found using
Coccinelle:
@rule1@
expression e1;
identifier x;
@@
*x = pci_map_single(...);
... when != pci_dma_mapping_error(e1,x)
Signed-off-by: Tina Johnson <tinajohnson.1234@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/eni.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index d65975a..c7fab3e 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c @@ -356,6 +356,8 @@ static int do_rx_dma(struct atm_vcc *vcc,struct sk_buff *skb, if (skb) { paddr = pci_map_single(eni_dev->pci_dev,skb->data,skb->len, PCI_DMA_FROMDEVICE); + if (pci_dma_mapping_error(eni_dev->pci_dev, paddr)) + goto dma_map_error; ENI_PRV_PADDR(skb) = paddr; if (paddr & 3) printk(KERN_CRIT DEV_LABEL "(itf %d): VCI %d has " @@ -481,6 +483,7 @@ trouble: if (paddr) pci_unmap_single(eni_dev->pci_dev,paddr,skb->len, PCI_DMA_FROMDEVICE); +dma_map_error: if (skb) dev_kfree_skb_irq(skb); return -1; } |
