From: Bruce Richardson Date: Mon, 8 Apr 2019 09:46:38 +0000 (+0100) Subject: net/i40e: fix dereference before null check in mbuf release X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=3f1b8bf9139ab94aa5ba1334499c3928ec630359;p=dpdk.git net/i40e: fix dereference before null check in mbuf release Coverity flags that the txq variable is used before it's checked for NULL. Also fix typo in error message. Coverity issue: 195023 Fixes: 24853544c84c ("net/i40e: fix mbuf free in vector Tx") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Rami Rosen --- diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index 58ed8145db..1489552da4 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -2423,13 +2423,13 @@ i40e_tx_queue_release_mbufs(struct i40e_tx_queue *txq) struct rte_eth_dev *dev; uint16_t i; - dev = &rte_eth_devices[txq->port_id]; - if (!txq || !txq->sw_ring) { - PMD_DRV_LOG(DEBUG, "Pointer to rxq or sw_ring is NULL"); + PMD_DRV_LOG(DEBUG, "Pointer to txq or sw_ring is NULL"); return; } + dev = &rte_eth_devices[txq->port_id]; + /** * vPMD tx will not set sw_ring's mbuf to NULL after free, * so need to free remains more carefully.