| Message ID | 1355273834.23544.37.camel@shinybook.infradead.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: David Woodhouse <dwmw2@infradead.org> Date: Wed, 12 Dec 2012 00:57:14 +0000 > 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> > Cc: stable@kernel.org Acked-by: David S. Miller <davem@davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David Miller <davem@davemloft.net> Date: Wed, 12 Dec 2012 00:23:45 -0500 (EST) > From: David Woodhouse <dwmw2@infradead.org> > Date: Wed, 12 Dec 2012 00:57:14 +0000 > >> 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> >> Cc: stable@kernel.org > > Acked-by: David S. Miller <davem@davemloft.net> Sorry, fingers slipped, I meant "Applied" :-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index 6619a8a..c909b7b 100644 --- a/drivers/atm/solos-pci.c +++ b/drivers/atm/solos-pci.c @@ -945,10 +945,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)
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> Cc: stable@kernel.org --- drivers/atm/solos-pci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)