From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9B02A428D4
for <public@inbox.dpdk.org>; Wed, 5 Apr 2023 17:44:36 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 9220F42BD9;
Wed, 5 Apr 2023 17:44:36 +0200 (CEST)
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
by mails.dpdk.org (Postfix) with ESMTP id 09E1641133;
Wed, 5 Apr 2023 17:44:33 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1680709474; x=1712245474;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=vyG6oyrJvzCQDUTMUwfJrdN9vsdcCdtrQddmeHIlMYc=;
b=WhUMs7/V4qq/n8UWE/+deUGoDqq9uSUTneH26YOaa+MT+JYOzJnBeZoV
rfRoRzznTYrCLGkoTfFIV17vhRxBcIdHREI3Ff2xWZqQr7ZCfp3UiZmDD
l52zFlHD/AEwDYJyGOXdmltuHxrzIfWkXEJFBE9E+8kCKWRuuhvlWIwra
wxvQEG7yERnUSrTP81fWMsJNUnCPpXmI9ZvS9DgR+obWrtTZuX0RULltb
eWCoJYPTjRzTS67E5DBsZuxHzRIuIzHnQskOLByi2swOTFVJHeW1hOsi3
vsvDUWyJTicV+dJPI+5NYymIK7xVf9o6IO8E9RVUn/V3PTvGqs2Hzr8Bb Q==;
X-IronPort-AV: E=McAfee;i="6600,9927,10671"; a="339980353"
X-IronPort-AV: E=Sophos;i="5.98,321,1673942400"; d="scan'208";a="339980353"
Received: from orsmga002.jf.intel.com ([10.7.209.21])
by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
05 Apr 2023 08:44:30 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=McAfee;i="6600,9927,10671"; a="686790254"
X-IronPort-AV: E=Sophos;i="5.98,321,1673942400"; d="scan'208";a="686790254"
Received: from silpixa00401385.ir.intel.com ([10.237.214.40])
by orsmga002.jf.intel.com with ESMTP; 05 Apr 2023 08:44:28 -0700
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: ciara.power@intel.com, roretzla@linux.microsoft.com,
Bruce Richardson <bruce.richardson@intel.com>, stable@dpdk.org
Subject: [PATCH v2 1/5] telemetry: fix autotest failures on Alpine
Date: Wed, 5 Apr 2023 16:44:10 +0100
Message-Id: <20230405154414.183915-2-bruce.richardson@intel.com>
X-Mailer: git-send-email 2.37.2
In-Reply-To: <20230405154414.183915-1-bruce.richardson@intel.com>
References: <20230310181836.162336-1-bruce.richardson@intel.com>
<20230405154414.183915-1-bruce.richardson@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
On Alpine linux, the telemetry_data_autotest was failing for the
test where we had dictionaries embedded in other dictionaries up
to three levels deep. Indications are that this issue is due to
excess data being stored on the stack, so replace stack-allocated
buffer data with dynamically allocated data in the case where we
are doing recursive processing of telemetry data structures into
json.
Bugzilla ID: 1177
Fixes: c933bb5177ca ("telemetry: support array values in data object")
Fixes: d2671e642a8e ("telemetry: support dict of dicts")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
V2:
set '\0' in newly malloc'ed buffer to ensure it always has valid
string data.
---
lib/telemetry/telemetry.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 7bceadcee7..728a0bffd4 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -208,7 +208,11 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len)
break;
case RTE_TEL_CONTAINER:
{
- char temp[buf_len];
+ char *temp = malloc(buf_len);
+ if (temp == NULL)
+ break;
+ *temp = '\0'; /* ensure valid string */
+
const struct container *cont =
&v->value.container;
if (container_to_json(cont->data,
@@ -219,6 +223,7 @@ container_to_json(const struct rte_tel_data *d, char *out_buf, size_t buf_len)
v->name, temp);
if (!cont->keep)
rte_tel_data_free(cont->data);
+ free(temp);
break;
}
}
@@ -275,7 +280,11 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s)
break;
case RTE_TEL_CONTAINER:
{
- char temp[buf_len];
+ char *temp = malloc(buf_len);
+ if (temp == NULL)
+ break;
+ *temp = '\0'; /* ensure valid string */
+
const struct container *cont =
&v->value.container;
if (container_to_json(cont->data,
@@ -286,6 +295,7 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s)
v->name, temp);
if (!cont->keep)
rte_tel_data_free(cont->data);
+ free(temp);
}
}
}
@@ -311,7 +321,11 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s)
buf_len, used,
d->data.array[i].uval);
else if (d->type == TEL_ARRAY_CONTAINER) {
- char temp[buf_len];
+ char *temp = malloc(buf_len);
+ if (temp == NULL)
+ break;
+ *temp = '\0'; /* ensure valid string */
+
const struct container *rec_data =
&d->data.array[i].container;
if (container_to_json(rec_data->data,
@@ -321,6 +335,7 @@ output_json(const char *cmd, const struct rte_tel_data *d, int s)
buf_len, used, temp);
if (!rec_data->keep)
rte_tel_data_free(rec_data->data);
+ free(temp);
}
break;
}
--
2.37.2