[dpdk-stable] patch 'examples/power: fix json null termination' has been queued to LTS release 18.11.2

[Kevin Traynor]

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 <david.hunt at intel.com>
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 <david.hunt at intel.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 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 at 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)