lkml.org 
[lkml]   [2013]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 102/222] solos-pci: fix double-free of TX skb in DMA mode
    Date
    3.5.7.3 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: David Woodhouse <dwmw2@infradead.org>

    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: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    drivers/atm/solos-pci.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
    index 9851093..1853a45 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)
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-01-16 20:22    [W:3.323 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site