From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ADF8E45804 for ; Fri, 23 Aug 2024 18:21:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A4D2D4337C; Fri, 23 Aug 2024 18:21:50 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id E601C40295 for ; Fri, 23 Aug 2024 18:21:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hGdiAeDZPFkgYzL2Vxd2WiwgmzoTR4ocrZhAJXXLlvw=; b=i1BYi5N9yheBQX/GfsxGW+3v7SVe+IXcMi+1otTJp1Lt//D8u+ud2iP5tl7BWkiYrjAws5 H1ik0qcGLj9jZbK75erHF7rci8py61XIeUe3Y7XXzqY1/P4c1+MaxKuMwT7DYGRGm8p8Ha OWC5Z9B6tN6DyPe3XYey60lStfkHOXA= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-507-S3IMVfH8OFu8Zq2GOoXHTQ-1; Fri, 23 Aug 2024 12:21:47 -0400 X-MC-Unique: S3IMVfH8OFu8Zq2GOoXHTQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5E5A01955F3D; Fri, 23 Aug 2024 16:21:46 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8CC1F1956053; Fri, 23 Aug 2024 16:21:44 +0000 (UTC) From: Kevin Traynor To: Zhichao Zeng Cc: Song Jiale , dpdk stable Subject: patch 'telemetry: fix connection parameter parsing' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:07 +0100 Message-ID: <20240823161929.1004778-59-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/38c54ad34e8f942401837c91c843954c3785f730 Thanks. Kevin --- >From 38c54ad34e8f942401837c91c843954c3785f730 Mon Sep 17 00:00:00 2001 From: Zhichao Zeng Date: Fri, 21 Jun 2024 10:40:37 +0800 Subject: [PATCH] telemetry: fix connection parameter parsing [ upstream commit efdf81829076198189ba6ccbb2e5c50270f56992 ] For calling memcpy when the source and destination addresses are the same, there is a small probability that there will be a copy error issue in some environments, resulting in a failure to connect. This patch uses memmove instead of memcpy to avoid this issue. Fixes: b80fe1805eee ("telemetry: introduce backward compatibility") Signed-off-by: Zhichao Zeng Tested-by: Song Jiale --- lib/telemetry/telemetry_legacy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/telemetry/telemetry_legacy.c b/lib/telemetry/telemetry_legacy.c index 8aba44d689..5996fe83cf 100644 --- a/lib/telemetry/telemetry_legacy.c +++ b/lib/telemetry/telemetry_legacy.c @@ -94,5 +94,5 @@ register_client(const char *cmd __rte_unused, const char *params, #ifndef RTE_EXEC_ENV_WINDOWS strlcpy(data, strchr(params, ':'), sizeof(data)); - memcpy(data, &data[strlen(":\"")], strlen(data)); + memmove(data, &data[strlen(":\"")], strlen(data)); if (!strchr(data, '\"')) { fprintf(stderr, "Invalid client data\n"); -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:11.625099138 +0100 +++ 0059-telemetry-fix-connection-parameter-parsing.patch 2024-08-23 17:18:09.723430116 +0100 @@ -1 +1 @@ -From efdf81829076198189ba6ccbb2e5c50270f56992 Mon Sep 17 00:00:00 2001 +From 38c54ad34e8f942401837c91c843954c3785f730 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit efdf81829076198189ba6ccbb2e5c50270f56992 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 4c1d1c353a..578230732c 100644 +index 8aba44d689..5996fe83cf 100644 @@ -25 +26 @@ -@@ -95,5 +95,5 @@ register_client(const char *cmd __rte_unused, const char *params, +@@ -94,5 +94,5 @@ register_client(const char *cmd __rte_unused, const char *params,