lkml.org 
[lkml]   [2017]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 165/178] net: tc35815: move free after the dereference
    3.16.46-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit 11faa7b0359aaf7efd406b7a6a077fda2b037d8e upstream.

    We dereference "skb" to get "skb->len" so we should probably do that
    step before freeing the skb.

    Fixes: eea221ce4880 ("tc35815 driver update (take 2)")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/net/ethernet/toshiba/tc35815.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/ethernet/toshiba/tc35815.c
    +++ b/drivers/net/ethernet/toshiba/tc35815.c
    @@ -1048,8 +1048,8 @@ tc35815_free_queues(struct net_device *d
    BUG_ON(lp->tx_skbs[i].skb != skb);
    #endif
    if (skb) {
    - dev_kfree_skb(skb);
    pci_unmap_single(lp->pci_dev, lp->tx_skbs[i].skb_dma, skb->len, PCI_DMA_TODEVICE);
    + dev_kfree_skb(skb);
    lp->tx_skbs[i].skb = NULL;
    lp->tx_skbs[i].skb_dma = 0;
    }
    \
     
     \ /
      Last update: 2017-07-16 16:09    [W:3.519 / U:0.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site