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 3B9D4455AD for ; Mon, 15 Jul 2024 17:27:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 368AF4065F; Mon, 15 Jul 2024 17:27:32 +0200 (CEST) Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by mails.dpdk.org (Postfix) with ESMTP id AA89A402DD for ; Mon, 15 Jul 2024 17:27:30 +0200 (CEST) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-52ea33671ffso4502788e87.3 for ; Mon, 15 Jul 2024 08:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057250; x=1721662050; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fMhXq/1Mah4YeybdLZ7lFelEnW8X3ANDkBWtiRVrWZk=; b=WWgOf0EIqjrrKdegPGGbtlh/BPQL5D3oLj7LJdSH2nXs52TnpZcDHZUJCHuiM6i5VZ 1tGTG9cqYCGL/D6uWFohFahRXNnIpoh5eEpLfvVDIkwXFpC6xFWWl+zCCGCuXkmUzNhf y45uqiKHH2Vy8jKUGATxAXznR7pPzlwIYBZPJ8lknSiqhmfhZPRZQj/YbGi4T5vZ9LG2 p0r1N3J4MQ/FOGdMt2MLsfhH+LD9z9XOPiIln9t0pyBWEVXdqbXfgJorgw/oYkVf3+7T Rqb9Y8EM5gZhBWg5WYnJOJKsrtGYK4zwvnUOwQTU2FmSDxR9R3tNJcmY/qENj7X0V/fk y2mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057250; x=1721662050; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fMhXq/1Mah4YeybdLZ7lFelEnW8X3ANDkBWtiRVrWZk=; b=pU2Mf1bFmyzju7UQ6Di/hHC+lOg7EXILF80iFpKx6pXyQiBBOAYUfrVbOqFSaqOzik tX565LWnV81LGfe2Y3nxdCyhKWnlcM0K9R9P7y9vKuDas74gB2gdCvA35FHiAHh7QTR3 eclf4+b5uPPkqgfYSIKLtkbFoqM8f/QwhrLNzgufb0HFcM6Vw8R1AbuT3Y6O965ZnPZl D6vkGgnJyivtuA8dnd3FiU5kTTPT82r1DiNZvrrWDOy+IftgQ/Z5Xl2yc2cxLsQ1vQ3j fmqsDITk1kTzgHkpDPeAQCKiaPq+HW/bXx8G7G0Om5eF/9jzKuO1zjj3RKKlEVnN4K6Y Jslw== X-Forwarded-Encrypted: i=1; AJvYcCWaLbV/mCoYkPWLCYWBpS6cGVsfgoIwJFCl1cNyQ/Pdxzm+T4lipANJxfWW3n84U5fym5mR8YEZWCApEZ6EGO8= X-Gm-Message-State: AOJu0YxULSBjNJTzAM7xO88o2Skqz9NVpP7+uprI+0A+ZrmLpCUZ/yRJ QehtefUWnMRKAg72M4XWnVUzdx+jVpvM4N89C47lnLmnu3vOuFj4ZyC5MJJe X-Google-Smtp-Source: AGHT+IEPX63ZuqWXQjziIKhrAuH508sleTjyEdLlxCNn1LqGEdPtdBRX413xIUqVGZhQ3C9NrCzXsw== X-Received: by 2002:a05:6512:2254:b0:52b:8ef7:bf1f with SMTP id 2adb3069b0e04-52eb999a67cmr14557564e87.17.1721057249811; Mon, 15 Jul 2024 08:27:29 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f27846bsm125889145e9.25.2024.07.15.08.27.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:27:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Zhichao Zeng Cc: Song Jiale , dpdk stable Subject: patch 'telemetry: fix connection parameter parsing' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:25:47 +0100 Message-Id: <20240715152704.2229503-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-1-luca.boccassi@gmail.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 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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/63cc1ddb1b3feea8a9c7b7a76a0e562f32fe99e2 Thanks. Luca Boccassi --- >From 63cc1ddb1b3feea8a9c7b7a76a0e562f32fe99e2 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 4c1d1c353a..578230732c 100644 --- a/lib/telemetry/telemetry_legacy.c +++ b/lib/telemetry/telemetry_legacy.c @@ -94,7 +94,7 @@ 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"); return -1; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:35.250141450 +0100 +++ 0009-telemetry-fix-connection-parameter-parsing.patch 2024-07-15 16:19:34.448203901 +0100 @@ -1 +1 @@ -From efdf81829076198189ba6ccbb2e5c50270f56992 Mon Sep 17 00:00:00 2001 +From 63cc1ddb1b3feea8a9c7b7a76a0e562f32fe99e2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit efdf81829076198189ba6ccbb2e5c50270f56992 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org