korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 21:54:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

drivers: atm: eni: Add pci_dma_mapping_error() call

Browse Source 
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>
This commit is contained in:
Tina Johnson 2014-11-20 15:54:54 +05:30 committed by David S. Miller
parent 49ed2617a0
commit 541675580f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/atm/eni.c
View File

@ -356,6 +356,8 @@ static int do_rx_dma(struct atm_vcc *vcc,struct sk_buff *skb,
if (skb) { if (skb) {
paddr = pci_map_single(eni_dev->pci_dev,skb->data,skb->len, paddr = pci_map_single(eni_dev->pci_dev,skb->data,skb->len,
PCI_DMA_FROMDEVICE); PCI_DMA_FROMDEVICE);
if (pci_dma_mapping_error(eni_dev->pci_dev, paddr))
goto dma_map_error;
ENI_PRV_PADDR(skb) = paddr; ENI_PRV_PADDR(skb) = paddr;
if (paddr & 3) if (paddr & 3)
printk(KERN_CRIT DEV_LABEL "(itf %d): VCI %d has " printk(KERN_CRIT DEV_LABEL "(itf %d): VCI %d has "
@ -481,6 +483,7 @@ trouble:
if (paddr) if (paddr)
pci_unmap_single(eni_dev->pci_dev,paddr,skb->len, pci_unmap_single(eni_dev->pci_dev,paddr,skb->len,
PCI_DMA_FROMDEVICE); PCI_DMA_FROMDEVICE);
dma_map_error:
if (skb) dev_kfree_skb_irq(skb); if (skb) dev_kfree_skb_irq(skb);
return -1; return -1;
} }