diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2012-12-11 14:57:14 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-11 09:07:16 -0800 |
| commit | fdbe6fecef94b6171de7a2ccfe543a694c9c41bc (patch) | |
| tree | 07e41788190fe7045db8ac98d052b9af5bf12fc9 | |
| parent | 042279bf26576ada65948ea45ab7ac86e0490c0a (diff) | |
| download | linux-3.10-fdbe6fecef94b6171de7a2ccfe543a694c9c41bc.tar.gz linux-3.10-fdbe6fecef94b6171de7a2ccfe543a694c9c41bc.tar.bz2 linux-3.10-fdbe6fecef94b6171de7a2ccfe543a694c9c41bc.zip | |
solos-pci: fix double-free of TX skb in DMA mode
commit cae49ede00ec3d0cda290b03fee55b72b49efc11 upstream.
We weren't clearing card->tx_skb[port] when processing the TX done interrupt.
If there wasn't another skb ready to transmit immediately, this led to a
double-free because we'd free it *again* next time we did have a packet to
send.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/atm/solos-pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index 98510931c81..1853a45c668 100644 --- a/drivers/atm/solos-pci.c +++ b/drivers/atm/solos-pci.c @@ -967,10 +967,11 @@ static uint32_t fpga_tx(struct solos_card *card) for (port = 0; tx_pending; tx_pending >>= 1, port++) { if (tx_pending & 1) { struct sk_buff *oldskb = card->tx_skb[port]; - if (oldskb) + if (oldskb) { pci_unmap_single(card->dev, SKB_CB(oldskb)->dma_addr, oldskb->len, PCI_DMA_TODEVICE); - + card->tx_skb[port] = NULL; + } spin_lock(&card->tx_queue_lock); skb = skb_dequeue(&card->tx_queue[port]); if (!skb) |