diff options
| author | Colin Ian King <colin.king@canonical.com> | 2017-08-18 12:11:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-18 10:28:06 -0700 |
| commit | eac2c68d663effb077210218788952b5a0c1f60e (patch) | |
| tree | fcd5bc7f3dd1f73d6f767626de623b55eaf8cd36 | |
| parent | acc8b31665b4cc17b35c4fa445427f7e2f6dc86b (diff) | |
| download | linux-stable-eac2c68d663effb077210218788952b5a0c1f60e.tar.gz linux-stable-eac2c68d663effb077210218788952b5a0c1f60e.tar.bz2 linux-stable-eac2c68d663effb077210218788952b5a0c1f60e.zip | |
nfp: fix infinite loop on umapping cleanup
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>
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 4631ca8b8eb2..9f77ce038a4a 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -908,8 +908,7 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) return NETDEV_TX_OK; err_unmap: - --f; - while (f >= 0) { + while (--f >= 0) { frag = &skb_shinfo(skb)->frags[f]; dma_unmap_page(dp->dev, tx_ring->txbufs[wr_idx].dma_addr, skb_frag_size(frag), DMA_TO_DEVICE); |