1 From cae49ede00ec3d0cda290b03fee55b72b49efc11 Mon Sep 17 00:00:00 2001
2 From: David Woodhouse <dwmw2@infradead.org>
3 Date: Tue, 11 Dec 2012 14:57:14 +0000
4 Subject: [PATCH] solos-pci: fix double-free of TX skb in DMA mode
6 We weren't clearing card->tx_skb[port] when processing the TX done interrupt.
7 If there wasn't another skb ready to transmit immediately, this led to a
8 double-free because we'd free it *again* next time we did have a packet to
11 Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
13 Signed-off-by: David S. Miller <davem@davemloft.net>
15 drivers/atm/solos-pci.c | 5 +++--
16 1 file changed, 3 insertions(+), 2 deletions(-)
18 --- a/drivers/atm/solos-pci.c
19 +++ b/drivers/atm/solos-pci.c
20 @@ -945,10 +945,11 @@ static uint32_t fpga_tx(struct solos_car
21 for (port = 0; tx_pending; tx_pending >>= 1, port++) {
23 struct sk_buff *oldskb = card->tx_skb[port];
26 pci_unmap_single(card->dev, SKB_CB(oldskb)->dma_addr,
27 oldskb->len, PCI_DMA_TODEVICE);
29 + card->tx_skb[port] = NULL;
31 spin_lock(&card->tx_queue_lock);
32 skb = skb_dequeue(&card->tx_queue[port]);