From: Ye Xiaolong <xiaolong.ye@intel.com>
To: Xiao Zhang <xiao.zhang@intel.com>
Cc: dev@dpdk.org, wenzhuo.lu@intel.com, stable@dpdk.org
Subject: Re: [dpdk-dev] [PATCH] net/e1000: fix unchecked return value coverity issue
Date: Mon, 5 Aug 2019 13:39:13 +0800 [thread overview]
Message-ID: <20190805053913.GE51603@intel.com> (raw)
In-Reply-To: <1564954020-38741-1-git-send-email-xiao.zhang@intel.com>
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>
next prev parent reply other threads:[~2019-08-05 5:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-04 21:27 Xiao Zhang
2019-08-05 5:39 ` Ye Xiaolong [this message]
2019-08-06 11:14 ` Zhang, Qi Z
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190805053913.GE51603@intel.com \
--to=xiaolong.ye@intel.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
--cc=wenzhuo.lu@intel.com \
--cc=xiao.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).