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 6D0E646BAE for ; Fri, 18 Jul 2025 21:34:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 675E840611; Fri, 18 Jul 2025 21:34:53 +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 06AE040E31 for ; Fri, 18 Jul 2025 21:34:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867291; 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=mHOo6Myf91b9XrWZ/XHR50Ane0YMccTrTypGOfaG7Dk=; b=LYhrOkybK30RIjOoDAJV0i5P6SeA993ij9ioU3YrjibN++EMU6/ohjG3QLGNL3i49rGzXj lW1FqNg+bvHJoBCgO0kr27wraYuenNiIVj8GkTs2dXsZqIldlIkDwBsMkaXOVSANHWvKb+ ikp9t+uyNhKUIHnTgmqZ0sfMe4qCOyk= Received: from mx-prod-mc-02.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-681-AD3G5rnsOE2GOXIkiqOXHg-1; Fri, 18 Jul 2025 15:34:48 -0400 X-MC-Unique: AD3G5rnsOE2GOXIkiqOXHg-1 X-Mimecast-MFC-AGG-ID: AD3G5rnsOE2GOXIkiqOXHg_1752867287 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7B2181956046; Fri, 18 Jul 2025 19:34:47 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 47A6318003FC; Fri, 18 Jul 2025 19:34:45 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/null: fix packet copy' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:47 +0100 Message-ID: <20250718193247.1008129-53-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-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: cqzk_tzuoPf8R0uimGUuFrqC8e3KOE1GL3sMUURyQnU_1752867287 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.3 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/23/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/37a49c7d679abb72f5d9b705b3a6325962818df1 Thanks. Kevin --- >From 37a49c7d679abb72f5d9b705b3a6325962818df1 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 1 Apr 2025 16:47:26 -0700 Subject: [PATCH] net/null: fix packet copy [ upstream commit 0ffd3bc09be5f77b26c16e501e4b4465b1bcb8da ] If doing copy on transmit, can potentially copy paste the data in the mbuf. Change to only copy data from that segment. Fixes: c743e50c475f ("null: new poll mode driver") Signed-off-by: Stephen Hemminger --- drivers/net/null/rte_eth_null.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 6764cf2ec1..966748689f 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -36,5 +36,5 @@ struct null_queue { struct rte_mempool *mb_pool; - struct rte_mbuf *dummy_packet; + void *dummy_packet; RTE_ATOMIC(uint64_t) rx_pkts; @@ -164,15 +164,15 @@ static uint16_t eth_null_copy_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) { - int i; struct null_queue *h = q; - unsigned int packet_size; + unsigned int i; if ((q == NULL) || (bufs == NULL)) return 0; - packet_size = h->internals->packet_size; for (i = 0; i < nb_bufs; i++) { - rte_memcpy(h->dummy_packet, rte_pktmbuf_mtod(bufs[i], void *), - packet_size); + struct rte_mbuf *m = bufs[i]; + size_t len = RTE_MIN(h->internals->packet_size, m->data_len); + + rte_memcpy(h->dummy_packet, rte_pktmbuf_mtod(m, void *), len); rte_pktmbuf_free(bufs[i]); } -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:12.928882707 +0100 +++ 0053-net-null-fix-packet-copy.patch 2025-07-18 20:29:10.933907340 +0100 @@ -1 +1 @@ -From 0ffd3bc09be5f77b26c16e501e4b4465b1bcb8da Mon Sep 17 00:00:00 2001 +From 37a49c7d679abb72f5d9b705b3a6325962818df1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0ffd3bc09be5f77b26c16e501e4b4465b1bcb8da ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org