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 708CFA0096 for ; Wed, 8 May 2019 12:16:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5F21137AF; Wed, 8 May 2019 12:16:44 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 3D8844C8D for ; Wed, 8 May 2019 12:16:43 +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 A2D433004144; Wed, 8 May 2019 10:16:42 +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 918751A267; Wed, 8 May 2019 10:16:41 +0000 (UTC) From: Kevin Traynor To: Reshma Pattan Cc: David Hunt , dpdk stable Date: Wed, 8 May 2019 11:15:13 +0100 Message-Id: <20190508101534.8984-31-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.46]); Wed, 08 May 2019 10:16:42 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/power: fix string 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/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/72be583f5a51630f79572dc6066b0cd89ee3868c Thanks. Kevin Traynor --- >From 72be583f5a51630f79572dc6066b0cd89ee3868c Mon Sep 17 00:00:00 2001 From: Reshma Pattan Date: Tue, 9 Apr 2019 17:00:24 +0100 Subject: [PATCH] examples/power: fix string null termination [ upstream commit 4c2caea070fb1ceb16688870d44bd4016ce5d0e4 ] After the read() the jason_data null termination is missing for the case "indent < 0", for "indent > 0" and "indent == 0" cases null termination is already handled. So add the missing case "indent < 0" to the existing "indent == 0" case to fix null termination. Coverity issue: 337680 Fixes: a63504a90f ("examples/power: add JSON string handling") Signed-off-by: Reshma Pattan Acked-by: David Hunt --- examples/vm_power_manager/channel_monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c index 5da531542..d45d8f74b 100644 --- a/examples/vm_power_manager/channel_monitor.c +++ b/examples/vm_power_manager/channel_monitor.c @@ -836,5 +836,5 @@ read_json_packet(struct channel_info *chan_info) if ((indent > 0) || (idx > 0)) idx++; - if (indent == 0) + if (indent <= 0) json_data[idx] = 0; if (idx >= MAX_JSON_STRING_LEN-1) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:07.379828478 +0100 +++ 0031-examples-power-fix-string-null-termination.patch 2019-05-08 11:05:05.814933075 +0100 @@ -1 +1 @@ -From 4c2caea070fb1ceb16688870d44bd4016ce5d0e4 Mon Sep 17 00:00:00 2001 +From 72be583f5a51630f79572dc6066b0cd89ee3868c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4c2caea070fb1ceb16688870d44bd4016ce5d0e4 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index ad1ddde07..bc5679d4b 100644 +index 5da531542..d45d8f74b 100644 @@ -27 +28 @@ -@@ -816,5 +816,5 @@ read_json_packet(struct channel_info *chan_info) +@@ -836,5 +836,5 @@ read_json_packet(struct channel_info *chan_info)