summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiao Zhang <xiao.zhang@intel.com>2019-08-05 05:27:00 +0800
committerQi Zhang <qi.z.zhang@intel.com>2019-08-06 13:07:54 +0200
commit08141dc7e1d65744ce46e4421e4930c3b0af374b (patch)
treeedaa13a4921884f3756a3607c7635388803b1666
parentaae5d9a6e2fba3eda11e0d93c2be0d44b3612965 (diff)
downloaddpdk-08141dc7e1d65744ce46e4421e4930c3b0af374b.zip
dpdk-08141dc7e1d65744ce46e4421e4930c3b0af374b.tar.gz
dpdk-08141dc7e1d65744ce46e4421e4930c3b0af374b.tar.xz
net/e1000: fix PCI config read check
Add return value checking when reading configure information from PCI register to avoid Coverity issue. Fixes: 1fc97012 ("net/e1000: fix i219 hang on reset/close") Cc: stable@dpdk.org Signed-off-by: Xiao Zhang <xiao.zhang@intel.com> Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>
-rw-r--r--drivers/net/e1000/em_rxtx.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
index 6f40b45..5925e49 100644
--- a/drivers/net/e1000/em_rxtx.c
+++ b/drivers/net/e1000/em_rxtx.c
@@ -2109,20 +2109,32 @@ em_flush_desc_rings(struct rte_eth_dev *dev)
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
uint16_t pci_cfg_status = 0;
+ int ret;
fextnvm11 = E1000_READ_REG(hw, E1000_FEXTNVM11);
E1000_WRITE_REG(hw, E1000_FEXTNVM11,
fextnvm11 | E1000_FEXTNVM11_DISABLE_MULR_FIX);
tdlen = E1000_READ_REG(hw, E1000_TDLEN(0));
- rte_pci_read_config(pci_dev, &pci_cfg_status, sizeof(pci_cfg_status),
- PCI_CFG_STATUS_REG);
+ ret = rte_pci_read_config(pci_dev, &pci_cfg_status,
+ sizeof(pci_cfg_status), PCI_CFG_STATUS_REG);
+ if (ret < 0) {
+ PMD_DRV_LOG(ERR, "Failed to read PCI offset 0x%x",
+ PCI_CFG_STATUS_REG);
+ return;
+ }
/* do nothing if we're not in faulty state, or if the queue is empty */
if ((pci_cfg_status & FLUSH_DESC_REQUIRED) && tdlen) {
/* flush desc ring */
e1000_flush_tx_ring(dev);
- rte_pci_read_config(pci_dev, &pci_cfg_status,
+ ret = rte_pci_read_config(pci_dev, &pci_cfg_status,
sizeof(pci_cfg_status), PCI_CFG_STATUS_REG);
+ if (ret < 0) {
+ PMD_DRV_LOG(ERR, "Failed to read PCI offset 0x%x",
+ PCI_CFG_STATUS_REG);
+ return;
+ }
+
if (pci_cfg_status & FLUSH_DESC_REQUIRED)
e1000_flush_rx_ring(dev);
}