lkml.org 
[lkml]   [2017]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 12/84] nfp: fix infinite loop on umapping cleanup
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Colin Ian King <colin.king@canonical.com>


    [ Upstream commit eac2c68d663effb077210218788952b5a0c1f60e ]

    The while loop that performs the dma page unmapping never decrements
    index counter f and hence loops forever. Fix this with a pre-decrement
    on f.

    Detected by CoverityScan, CID#1357309 ("Infinite loop")

    Fixes: 4c3523623dc0 ("net: add driver for Netronome NFP4000/NFP6000 NIC VFs")
    Signed-off-by: Colin Ian King <colin.king@canonical.com>
    Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
    +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
    @@ -871,8 +871,7 @@ static int nfp_net_tx(struct sk_buff *sk
    return NETDEV_TX_OK;

    err_unmap:
    - --f;
    - while (f >= 0) {
    + while (--f >= 0) {
    frag = &skb_shinfo(skb)->frags[f];
    dma_unmap_page(&nn->pdev->dev,
    tx_ring->txbufs[wr_idx].dma_addr,

    \
     
     \ /
      Last update: 2017-08-28 10:56    [W:4.248 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site