Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eac2c68d authored by Colin Ian King's avatar Colin Ian King Committed by David S. Miller
Browse files

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: 4c352362 ("net: add driver for Netronome NFP4000/NFP6000 NIC VFs")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent acc8b316

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+1 −2
Original line number Diff line number Diff line
@@ -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);