patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Yongseok Koh <yskoh@mellanox.com>
To: Tiwei Bie <tiwei.bie@intel.com>
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>,
	dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'net/virtio: fix unchecked return value' has been queued to LTS release 17.11.5
Date: Fri, 11 Jan 2019 02:31:36 -0800	[thread overview]
Message-ID: <20190111103142.21088-13-yskoh@mellanox.com> (raw)
In-Reply-To: <20190111103142.21088-1-yskoh@mellanox.com>

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 5fe500e3ddf31001d113b8937ae4f5cf1f2ec55d Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie@intel.com>
Date: Wed, 7 Nov 2018 17:01:01 +0800
Subject: [PATCH] net/virtio: fix unchecked return value

[ upstream commit ecfae1510edc1391285aa566a2d31e7eae8fc6d2 ]

Coverity issue: 302861
Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0")

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/virtio/virtio_pci.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 89986c335..249ec6d3a 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -658,9 +658,15 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
 			hw->common_cfg = get_cfg_addr(dev, &cap);
 			break;
 		case VIRTIO_PCI_CAP_NOTIFY_CFG:
-			rte_pci_read_config(dev, &hw->notify_off_multiplier,
+			ret = rte_pci_read_config(dev,
+					&hw->notify_off_multiplier,
 					4, pos + sizeof(cap));
-			hw->notify_base = get_cfg_addr(dev, &cap);
+			if (ret != 4)
+				PMD_INIT_LOG(DEBUG,
+					"failed to read notify_off_multiplier, ret %d",
+					ret);
+			else
+				hw->notify_base = get_cfg_addr(dev, &cap);
 			break;
 		case VIRTIO_PCI_CAP_DEVICE_CFG:
 			hw->dev_cfg = get_cfg_addr(dev, &cap);
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.594925472 -0800
+++ 0013-net-virtio-fix-unchecked-return-value.patch	2019-01-11 02:29:10.775983000 -0800
@@ -1,11 +1,12 @@
-From ecfae1510edc1391285aa566a2d31e7eae8fc6d2 Mon Sep 17 00:00:00 2001
+From 5fe500e3ddf31001d113b8937ae4f5cf1f2ec55d Mon Sep 17 00:00:00 2001
 From: Tiwei Bie <tiwei.bie@intel.com>
 Date: Wed, 7 Nov 2018 17:01:01 +0800
 Subject: [PATCH] net/virtio: fix unchecked return value
 
+[ upstream commit ecfae1510edc1391285aa566a2d31e7eae8fc6d2 ]
+
 Coverity issue: 302861
 Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0")
-Cc: stable@dpdk.org
 
 Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
@@ -14,10 +15,10 @@
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
-index 21110cd69..c8883c32e 100644
+index 89986c335..249ec6d3a 100644
 --- a/drivers/net/virtio/virtio_pci.c
 +++ b/drivers/net/virtio/virtio_pci.c
-@@ -614,9 +614,15 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
+@@ -658,9 +658,15 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
  			hw->common_cfg = get_cfg_addr(dev, &cap);
  			break;
  		case VIRTIO_PCI_CAP_NOTIFY_CFG:

  parent reply	other threads:[~2019-01-11 10:32 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-11 10:31 [dpdk-stable] patch 'net/octeontx: fix packet corruption on Tx' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: fix style and syntax in flow API guide' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/mvpp2: fix array initialization' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/mlx5: fix interrupt completion queue index wrapping' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: fix missing CCM to QAT feature list' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: check Rx VLAN offload flag to print VLAN TCI' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: fix typos in the flow API guide' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: fix metering and policing commands' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/virtio: fix PCI config error handling' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'bus/dpaa: fix build with gcc 9.0' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: fix RED byte stats' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'examples/flow_filtering: remove VLAN item' " Yongseok Koh
2019-01-11 10:31 ` Yongseok Koh [this message]
2019-01-11 10:31 ` [dpdk-stable] patch 'net/octeontx: fix mbuf corruption with large private sizes' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/testpmd: fix memory leak for TM object' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/octeontx: fix failures when available ports > queues' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'app/pdump: fix port id storage size' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'doc: add cross-compilation in sample apps guide' " Yongseok Koh
2019-01-11 10:31 ` [dpdk-stable] patch 'net/mlx4: fix possible uninitialized variable' " Yongseok Koh
  -- strict thread matches above, loose matches on Subject: below --
2018-11-29 23:09 [dpdk-stable] patch 'net/mlx5: add Bluefield device id' " Yongseok Koh
2018-11-29 23:11 ` [dpdk-stable] patch 'net/virtio: fix unchecked return value' " Yongseok Koh
2018-11-30 15:23   ` Tiwei Bie
2018-11-30 18:01     ` Yongseok Koh

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=20190111103142.21088-13-yskoh@mellanox.com \
    --to=yskoh@mellanox.com \
    --cc=maxime.coquelin@redhat.com \
    --cc=stable@dpdk.org \
    --cc=tiwei.bie@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).