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 4601DA0096 for ; Wed, 8 May 2019 18:02:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3F99BDE3; Wed, 8 May 2019 18:02:49 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 27FCA2C2B for ; Wed, 8 May 2019 18:02:48 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8CE98C05E757; Wed, 8 May 2019 16:02:47 +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 805ED60C82; Wed, 8 May 2019 16:02:46 +0000 (UTC) From: Kevin Traynor To: David Hunt Cc: Anatoly Burakov , dpdk stable Date: Wed, 8 May 2019 17:02:04 +0100 Message-Id: <20190508160233.2648-7-ktraynor@redhat.com> In-Reply-To: <20190508160233.2648-1-ktraynor@redhat.com> References: <20190508160233.2648-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 08 May 2019 16:02:47 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/power: fix json null termination' 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/14/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/b65421db4e5ec6d4efb1bad650ff5a11ae112fe8 Thanks. Kevin Traynor --- >From b65421db4e5ec6d4efb1bad650ff5a11ae112fe8 Mon Sep 17 00:00:00 2001 From: David Hunt Date: Fri, 26 Apr 2019 15:04:54 +0100 Subject: [PATCH] examples/power: fix json null termination [ upstream commit 8f8f876bd76f9ea996f0e80f32137aa9c2c2071a ] coverity complains about a null-termination after a read, so we terminate once we exit the do-while read loop. Coverity issue: 337680 Fixes: a63504a90f ("examples/power: add JSON string handling") Signed-off-by: David Hunt Reviewed-by: Anatoly Burakov --- examples/vm_power_manager/channel_monitor.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c index 954bdf787..b5b7c6787 100644 --- a/examples/vm_power_manager/channel_monitor.c +++ b/examples/vm_power_manager/channel_monitor.c @@ -843,10 +843,5 @@ read_json_packet(struct channel_info *chan_info) } while (indent > 0); - if (indent > 0) - /* - * We've broken out of the read loop without getting - * a closing brace, so throw away the data - */ - json_data[idx] = 0; + json_data[idx] = '\0'; if (strlen(json_data) == 0) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 16:33:57.858760579 +0100 +++ 0007-examples-power-fix-json-null-termination.patch 2019-05-08 16:33:57.361579781 +0100 @@ -1 +1 @@ -From 8f8f876bd76f9ea996f0e80f32137aa9c2c2071a Mon Sep 17 00:00:00 2001 +From b65421db4e5ec6d4efb1bad650ff5a11ae112fe8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8f8f876bd76f9ea996f0e80f32137aa9c2c2071a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 971e4f2bc..4a287109b 100644 +index 954bdf787..b5b7c6787 100644 @@ -23 +24 @@ -@@ -823,10 +823,5 @@ read_json_packet(struct channel_info *chan_info) +@@ -843,10 +843,5 @@ read_json_packet(struct channel_info *chan_info)