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 6CED246211 for ; Thu, 13 Feb 2025 11:04:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6794A42F73; Thu, 13 Feb 2025 11:04:01 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id CA22142F35 for ; Thu, 13 Feb 2025 11:03:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739441039; 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=BYdvLNcqrPRgOdctqziSWMq8HdaHOoJR/fNeA6Fmrv8=; b=Q8xmNknR1alb1mFsZbavwiSK2SC+PXcu2zz1p47wDsg+DfHRJYd0QC3ke5sIM66mioTWpv ie5fDEdzZ9Rs+bERB5ft4stHUuSvinD0W5p1yqOCGgoaqBf6IJN2UVJm65ULewMLtvOD/5 TWUy4ROVmSRDDzkEqh+dwaOiv8sd+mw= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-552-QurZld0pMee7uBN-Rp0R7A-1; Thu, 13 Feb 2025 05:03:56 -0500 X-MC-Unique: QurZld0pMee7uBN-Rp0R7A-1 X-Mimecast-MFC-AGG-ID: QurZld0pMee7uBN-Rp0R7A Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 23A8B1800874; Thu, 13 Feb 2025 10:03:55 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E0A1C1800365; Thu, 13 Feb 2025 10:03:53 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'examples/ptpclient: fix message parsing' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:59:16 +0000 Message-ID: <20250213095933.362078-109-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: BflsLiKF6DnSj0Yf7d1XPXwoEZXbz6di3s6Lf1Cp5dw_1739441035 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 24.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 02/17/25. 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/3eed0aca9057c3d9d5b2e122093be7a789dbc23e Thanks. Kevin --- >From 3eed0aca9057c3d9d5b2e122093be7a789dbc23e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:10 -0800 Subject: [PATCH] examples/ptpclient: fix message parsing [ upstream commit 19630bd0d735badb06143086d4f1c50d726b7bad ] Calling memcmp on same structure will always be true. Replace with same conditional used elsewhere. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: ab129e9065a5 ("examples/ptpclient: add minimal PTP client") Signed-off-by: Stephen Hemminger --- examples/ptpclient/ptpclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index 7b6862d951..416363d8d0 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -370,5 +370,5 @@ parse_sync(struct ptpv2_time_receiver_ordinary *ptp_data, uint16_t rx_tstamp_idx } - if (memcmp(&ptp_hdr->source_port_id.clock_id, + if (memcmp(&ptp_data->transmitter_clock_id, &ptp_hdr->source_port_id.clock_id, sizeof(struct clock_id)) == 0) { -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:46.040836604 +0000 +++ 0109-examples-ptpclient-fix-message-parsing.patch 2025-02-12 17:29:34.630947600 +0000 @@ -1 +1 @@ -From 19630bd0d735badb06143086d4f1c50d726b7bad Mon Sep 17 00:00:00 2001 +From 3eed0aca9057c3d9d5b2e122093be7a789dbc23e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 19630bd0d735badb06143086d4f1c50d726b7bad ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 27d06dd91d..c344e7db1e 100644 +index 7b6862d951..416363d8d0 100644 @@ -23 +24 @@ -@@ -368,5 +368,5 @@ parse_sync(struct ptpv2_time_receiver_ordinary *ptp_data, uint16_t rx_tstamp_idx +@@ -370,5 +370,5 @@ parse_sync(struct ptpv2_time_receiver_ordinary *ptp_data, uint16_t rx_tstamp_idx