aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPan Bian <bianpan2016@163.com>2018-11-28 18:54:22 -0500
committerDavid S. Miller <davem@davemloft.net>2018-11-30 20:20:39 -0500
commitc0f53771ba45745e5870daf880127925c93f232f (patch)
tree98c4eaa140940837967a4128b6b69bf89f10bbd7
parentef6fcd455278c2be3032a346cc66d9dd9866b787 (diff)
liquidio: read sc->iq_no before release sc
The function lio_vf_rep_packet_sent_callback releases the occupation of sc via octeon_free_soft_command. sc should not be used after that. Unfortunately, sc->iq_no is read. To fix this, the patch stores sc->iq_no into a local variable before releasing sc and then uses the local variable instead of sc->iq_no. Signed-off-by: Pan Bian <bianpan2016@163.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
index ea9859e028d4..de61060721c4 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
@@ -349,13 +349,15 @@ lio_vf_rep_packet_sent_callback(struct octeon_device *oct,
349 struct octeon_soft_command *sc = (struct octeon_soft_command *)buf; 349 struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;
350 struct sk_buff *skb = sc->ctxptr; 350 struct sk_buff *skb = sc->ctxptr;
351 struct net_device *ndev = skb->dev; 351 struct net_device *ndev = skb->dev;
352 u32 iq_no;
352 353
353 dma_unmap_single(&oct->pci_dev->dev, sc->dmadptr, 354 dma_unmap_single(&oct->pci_dev->dev, sc->dmadptr,
354 sc->datasize, DMA_TO_DEVICE); 355 sc->datasize, DMA_TO_DEVICE);
355 dev_kfree_skb_any(skb); 356 dev_kfree_skb_any(skb);
357 iq_no = sc->iq_no;
356 octeon_free_soft_command(oct, sc); 358 octeon_free_soft_command(oct, sc);
357 359
358 if (octnet_iq_is_full(oct, sc->iq_no)) 360 if (octnet_iq_is_full(oct, iq_no))
359 return; 361 return;
360 362
361 if (netif_queue_stopped(ndev)) 363 if (netif_queue_stopped(ndev))