[dpdk-stable] patch 'bitrate: fix unchecked return value' has been queued to LTS release 17.11.7

Yongseok Koh yskoh at mellanox.com
Tue Jul 23 03:00:56 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/19. So please
shout if anyone has objection.

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.

Thanks.

Yongseok

---
>From f74b758583a7c302902b14b0646884e3617e5d13 Mon Sep 17 00:00:00 2001
From: Andrius Sirvys <andrius.sirvys at intel.com>
Date: Thu, 18 Apr 2019 09:52:06 +0100
Subject: [PATCH] bitrate: fix unchecked return value

[ upstream commit 72ec13b0a1192d7a1503c12474cb0f11d2efe087 ]

Checking the return value of rte_metrics_update_values, if failed
returning that value.
Coverity had picked up that that the return value wasn't being checked.

Coverity issue: 336863
Fixes: 2ad7ba9a6567 ("bitrate: add bitrate statistics library")

Signed-off-by: Andrius Sirvys <andrius.sirvys at intel.com>
Acked-by: Rami Rosen <ramirose at gmail.com>
Acked-by: John McNamara <john.mcnamara at intel.com>
---
 lib/librte_bitratestats/rte_bitrate.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/librte_bitratestats/rte_bitrate.c b/lib/librte_bitratestats/rte_bitrate.c
index d39edbf627..92e7c775c1 100644
--- a/lib/librte_bitratestats/rte_bitrate.c
+++ b/lib/librte_bitratestats/rte_bitrate.c
@@ -96,6 +96,7 @@ rte_stats_bitrate_calc(struct rte_stats_bitrates *bitrate_data,
 	int64_t delta;
 	const int64_t alpha_percent = 20;
 	uint64_t values[6];
+	int ret;
 
 	if (bitrate_data == NULL)
 		return -EINVAL;
@@ -153,7 +154,10 @@ rte_stats_bitrate_calc(struct rte_stats_bitrates *bitrate_data,
 	values[3] = port_data->mean_obits;
 	values[4] = port_data->peak_ibits;
 	values[5] = port_data->peak_obits;
-	rte_metrics_update_values(port_id, bitrate_data->id_stats_set,
+	ret = rte_metrics_update_values(port_id, bitrate_data->id_stats_set,
 		values, ARRAY_SIZE(values));
+	if (ret < 0)
+		return ret;
+
 	return 0;
 }
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:11.271543637 -0700
+++ 0089-bitrate-fix-unchecked-return-value.patch	2019-07-22 17:55:06.422474000 -0700
@@ -1,15 +1,16 @@
-From 72ec13b0a1192d7a1503c12474cb0f11d2efe087 Mon Sep 17 00:00:00 2001
+From f74b758583a7c302902b14b0646884e3617e5d13 Mon Sep 17 00:00:00 2001
 From: Andrius Sirvys <andrius.sirvys at intel.com>
 Date: Thu, 18 Apr 2019 09:52:06 +0100
 Subject: [PATCH] bitrate: fix unchecked return value
 
+[ upstream commit 72ec13b0a1192d7a1503c12474cb0f11d2efe087 ]
+
 Checking the return value of rte_metrics_update_values, if failed
 returning that value.
 Coverity had picked up that that the return value wasn't being checked.
 
 Coverity issue: 336863
 Fixes: 2ad7ba9a6567 ("bitrate: add bitrate statistics library")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andrius Sirvys <andrius.sirvys at intel.com>
 Acked-by: Rami Rosen <ramirose at gmail.com>
@@ -19,10 +20,10 @@
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/lib/librte_bitratestats/rte_bitrate.c b/lib/librte_bitratestats/rte_bitrate.c
-index c4b28f6248..639e47547d 100644
+index d39edbf627..92e7c775c1 100644
 --- a/lib/librte_bitratestats/rte_bitrate.c
 +++ b/lib/librte_bitratestats/rte_bitrate.c
-@@ -67,6 +67,7 @@ rte_stats_bitrate_calc(struct rte_stats_bitrates *bitrate_data,
+@@ -96,6 +96,7 @@ rte_stats_bitrate_calc(struct rte_stats_bitrates *bitrate_data,
  	int64_t delta;
  	const int64_t alpha_percent = 20;
  	uint64_t values[6];
@@ -30,7 +31,7 @@
  
  	if (bitrate_data == NULL)
  		return -EINVAL;
-@@ -124,7 +125,10 @@ rte_stats_bitrate_calc(struct rte_stats_bitrates *bitrate_data,
+@@ -153,7 +154,10 @@ rte_stats_bitrate_calc(struct rte_stats_bitrates *bitrate_data,
  	values[3] = port_data->mean_obits;
  	values[4] = port_data->peak_ibits;
  	values[5] = port_data->peak_obits;


More information about the stable mailing list