From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 02ACBA0096 for ; Wed, 8 May 2019 12:16:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EC9DD2862; Wed, 8 May 2019 12:16:56 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A876A49DF for ; Wed, 8 May 2019 12:16:54 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1925C3084213; Wed, 8 May 2019 10:16:54 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECD84410E; Wed, 8 May 2019 10:16:52 +0000 (UTC) From: Kevin Traynor To: Andrius Sirvys Cc: Rami Rosen , John McNamara , dpdk stable Date: Wed, 8 May 2019 11:15:21 +0100 Message-Id: <20190508101534.8984-39-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 08 May 2019 10:16:54 +0000 (UTC) Subject: [dpdk-stable] patch 'bitrate: fix unchecked return value' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/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. 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/04f108be42876641c92ef8fe657f8963f9f2c31b Thanks. Kevin Traynor --- >From 04f108be42876641c92ef8fe657f8963f9f2c31b Mon Sep 17 00:00:00 2001 From: Andrius Sirvys 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 Acked-by: Rami Rosen Acked-by: John McNamara --- 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 c4b28f624..639e47547 100644 --- a/lib/librte_bitratestats/rte_bitrate.c +++ b/lib/librte_bitratestats/rte_bitrate.c @@ -68,4 +68,5 @@ rte_stats_bitrate_calc(struct rte_stats_bitrates *bitrate_data, const int64_t alpha_percent = 20; uint64_t values[6]; + int ret; if (bitrate_data == NULL) @@ -125,6 +126,9 @@ rte_stats_bitrate_calc(struct rte_stats_bitrates *bitrate_data, 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:07.780876148 +0100 +++ 0039-bitrate-fix-unchecked-return-value.patch 2019-05-08 11:05:05.847932385 +0100 @@ -1 +1 @@ -From 72ec13b0a1192d7a1503c12474cb0f11d2efe087 Mon Sep 17 00:00:00 2001 +From 04f108be42876641c92ef8fe657f8963f9f2c31b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 72ec13b0a1192d7a1503c12474cb0f11d2efe087 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org