[dpdk-stable] patch 'net/virtio: fix unchecked return value' has been queued to LTS release 16.11.9
Luca Boccassi
bluca at debian.org
Mon Nov 19 13:25:25 CET 2018
Hi,
FYI, your patch has been queued to LTS release 16.11.9
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/21/18. 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.
Luca Boccassi
---
>From 87b9d321789f9bdaa2cf11df2f7377bc1145e7fa Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at 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 at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
drivers/net/virtio/virtio_pci.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index f6d697f38..13ad57dfd 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -690,9 +690,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_eal_pci_read_config(dev, &hw->notify_off_multiplier,
- 4, pos + sizeof(cap));
- hw->notify_base = get_cfg_addr(dev, &cap);
+ ret = rte_eal_pci_read_config(dev,
+ &hw->notify_off_multiplier,
+ 4, pos + sizeof(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.19.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2018-11-19 12:15:18.275847477 +0000
+++ 0008-net-virtio-fix-unchecked-return-value.patch 2018-11-19 12:15:18.075611433 +0000
@@ -1,31 +1,33 @@
-From ecfae1510edc1391285aa566a2d31e7eae8fc6d2 Mon Sep 17 00:00:00 2001
+From 87b9d321789f9bdaa2cf11df2f7377bc1145e7fa Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at 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 at dpdk.org
Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
- drivers/net/virtio/virtio_pci.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
+ drivers/net/virtio/virtio_pci.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
-index 21110cd69..c8883c32e 100644
+index f6d697f38..13ad57dfd 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)
+@@ -690,9 +690,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));
+- rte_eal_pci_read_config(dev, &hw->notify_off_multiplier,
+- 4, pos + sizeof(cap));
- hw->notify_base = get_cfg_addr(dev, &cap);
++ ret = rte_eal_pci_read_config(dev,
++ &hw->notify_off_multiplier,
++ 4, pos + sizeof(cap));
+ if (ret != 4)
+ PMD_INIT_LOG(DEBUG,
+ "failed to read notify_off_multiplier, ret %d",
More information about the stable
mailing list