[dpdk-stable] patch 'examples/ethtool: fix unchecked return value' has been queued to LTS release 18.11.7

Kevin Traynor ktraynor at redhat.com
Wed Feb 19 16:55:47 CET 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/25/20. 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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/2042297f9d2e9c1b89167fea325ddaa5f7fccac2

Thanks.

Kevin.

---
>From 2042297f9d2e9c1b89167fea325ddaa5f7fccac2 Mon Sep 17 00:00:00 2001
From: Gargi Sau <gargi.sau at intel.com>
Date: Mon, 9 Dec 2019 06:37:56 +0000
Subject: [PATCH] examples/ethtool: fix unchecked return value

[ upstream commit 899f6de24bb6504d56369aef5f55bb370d58784d ]

This checks the return value from the function
rte_eth_dev_set_vlan_offload.

Coverity issue: 350358
Fixes: bda68ab9d1e7 ("examples/ethtool: add user-space ethtool sample application")

Signed-off-by: Gargi Sau <gargi.sau at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 examples/ethtool/lib/rte_ethtool.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/ethtool/lib/rte_ethtool.c b/examples/ethtool/lib/rte_ethtool.c
index 63344376c8..eba7dd9ac8 100644
--- a/examples/ethtool/lib/rte_ethtool.c
+++ b/examples/ethtool/lib/rte_ethtool.c
@@ -371,4 +371,5 @@ rte_ethtool_net_set_rx_mode(uint16_t port_id)
 	struct rte_eth_dev_info dev_info;
 	uint16_t vf;
+	int ret;
 
 	rte_eth_dev_info_get(port_id, &dev_info);
@@ -384,5 +385,7 @@ rte_ethtool_net_set_rx_mode(uint16_t port_id)
 
 	/* Enable Rx vlan filter, VF unspport status is discard */
-	rte_eth_dev_set_vlan_offload(port_id, ETH_VLAN_FILTER_MASK);
+	ret = rte_eth_dev_set_vlan_offload(port_id, ETH_VLAN_FILTER_MASK);
+	if (ret != 0)
+		return ret;
 
 	return 0;
-- 
2.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-19 15:43:49.857832385 +0000
+++ 0002-examples-ethtool-fix-unchecked-return-value.patch	2020-02-19 15:43:49.713142357 +0000
@@ -1 +1 @@
-From 899f6de24bb6504d56369aef5f55bb370d58784d Mon Sep 17 00:00:00 2001
+From 2042297f9d2e9c1b89167fea325ddaa5f7fccac2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 899f6de24bb6504d56369aef5f55bb370d58784d ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -16,2 +17,2 @@
- examples/ethtool/lib/rte_ethtool.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ examples/ethtool/lib/rte_ethtool.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
@@ -20 +21 @@
-index 667d7eaf27..db8150efd5 100644
+index 63344376c8..eba7dd9ac8 100644
@@ -23 +24,7 @@
-@@ -403,5 +403,7 @@ rte_ethtool_net_set_rx_mode(uint16_t port_id)
+@@ -371,4 +371,5 @@ rte_ethtool_net_set_rx_mode(uint16_t port_id)
+ 	struct rte_eth_dev_info dev_info;
+ 	uint16_t vf;
++	int ret;
+ 
+ 	rte_eth_dev_info_get(port_id, &dev_info);
+@@ -384,5 +385,7 @@ rte_ethtool_net_set_rx_mode(uint16_t port_id)



More information about the stable mailing list