* [dpdk-stable] [PATCH] net/e1000: fix unchecked return value coverity issue
@ 2019-08-04 21:27 Xiao Zhang
2019-08-05 5:39 ` [dpdk-stable] [dpdk-dev] " Ye Xiaolong
0 siblings, 1 reply; 3+ messages in thread
From: Xiao Zhang @ 2019-08-04 21:27 UTC (permalink / raw)
To: dev; +Cc: wenzhuo.lu, Xiao Zhang, stable
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>
---
drivers/net/e1000/em_rxtx.c | 18 +++++++++++++++---
1 file 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);
}
--
2.7.4
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH] net/e1000: fix unchecked return value coverity issue
2019-08-04 21:27 [dpdk-stable] [PATCH] net/e1000: fix unchecked return value coverity issue Xiao Zhang
@ 2019-08-05 5:39 ` Ye Xiaolong
2019-08-06 11:14 ` Zhang, Qi Z
0 siblings, 1 reply; 3+ messages in thread
From: Ye Xiaolong @ 2019-08-05 5:39 UTC (permalink / raw)
To: Xiao Zhang; +Cc: dev, wenzhuo.lu, stable
On 08/05, Xiao Zhang wrote:
>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>
>---
> drivers/net/e1000/em_rxtx.c | 18 +++++++++++++++---
> 1 file 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);
> }
>--
>2.7.4
>
Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH] net/e1000: fix unchecked return value coverity issue
2019-08-05 5:39 ` [dpdk-stable] [dpdk-dev] " Ye Xiaolong
@ 2019-08-06 11:14 ` Zhang, Qi Z
0 siblings, 0 replies; 3+ messages in thread
From: Zhang, Qi Z @ 2019-08-06 11:14 UTC (permalink / raw)
To: Ye, Xiaolong, Zhang, Xiao; +Cc: dev, Lu, Wenzhuo, stable
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Ye Xiaolong
> Sent: Monday, August 5, 2019 1:39 PM
> To: Zhang, Xiao <xiao.zhang@intel.com>
> Cc: dev@dpdk.org; Lu, Wenzhuo <wenzhuo.lu@intel.com>; stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/e1000: fix unchecked return value
> coverity issue
>
> On 08/05, Xiao Zhang wrote:
> >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>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-06 11:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-04 21:27 [dpdk-stable] [PATCH] net/e1000: fix unchecked return value coverity issue Xiao Zhang
2019-08-05 5:39 ` [dpdk-stable] [dpdk-dev] " Ye Xiaolong
2019-08-06 11:14 ` Zhang, Qi Z
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).