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 49BD946BAE for ; Fri, 18 Jul 2025 21:34:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4427440611; Fri, 18 Jul 2025 21:34:28 +0200 (CEST) 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 B9BCD40E2C for ; Fri, 18 Jul 2025 21:34:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867266; 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=2kynx9qcrZt0Z9S2CJ4OX7yGTLKqGPH6fm1pCyawrPA=; b=EqzkiOCzcPJKmlJgBR5P9q8dUoShF3RbtLubk1lweLpp7uBb4x12XUNGtia9b7rLTkWxDr 7nODDi8Yk/K1baft0W3zzbUs3DEtdVv+uGZiOHBVlR9n1VUodW7R7IVr2dIWixY/eo8ptj 1BqVPRcYt6KuQN7zaJEZf370BAb1/Nk= Received: from mx-prod-mc-06.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-142-R9gU4Y40MeeK58x6jPMjWA-1; Fri, 18 Jul 2025 15:34:23 -0400 X-MC-Unique: R9gU4Y40MeeK58x6jPMjWA-1 X-Mimecast-MFC-AGG-ID: R9gU4Y40MeeK58x6jPMjWA_1752867262 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DB6E71800292; Fri, 18 Jul 2025 19:34:21 +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 6771218003FC; Fri, 18 Jul 2025 19:34:20 +0000 (UTC) From: Kevin Traynor To: Ariel Otilibili Cc: Stephen Hemminger , dpdk stable Subject: patch 'net/af_xdp: fix use after free in zero-copy Tx' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:34 +0100 Message-ID: <20250718193247.1008129-40-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: kTxRSGhyjvzsMiJfFsb2d23o4S6x90t__PaBuY4cnMo_1752867262 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/f7b74c765d4fcace202c74ae2f26671f138145f9 Thanks. Kevin --- >From f7b74c765d4fcace202c74ae2f26671f138145f9 Mon Sep 17 00:00:00 2001 From: Ariel Otilibili Date: Wed, 26 Feb 2025 21:08:40 +0100 Subject: [PATCH] net/af_xdp: fix use after free in zero-copy Tx [ upstream commit a23bf7fde78b10afbbafda252f15495b26e010a9 ] tx_bytes is computed after both legs are tested. This might produce a use after memory free. The computation is now moved into each leg. Bugzilla ID: 1440 Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks") Signed-off-by: Ariel Otilibili Acked-by: Stephen Hemminger --- .mailmap | 2 +- drivers/net/af_xdp/rte_eth_af_xdp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index a4bacad9a4..257dd551a6 100644 --- a/.mailmap +++ b/.mailmap @@ -136,5 +136,5 @@ Apeksha Gupta Archana Muniganti Archit Pandey -Ariel Otilibili +Ariel Otilibili Arkadiusz Kubalewski Arkadiusz Kusztal diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index 814398ba4b..092bcb73aa 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -575,4 +575,5 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) offset = offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT; desc->addr = addr | offset; + tx_bytes += desc->len; count++; } else { @@ -602,9 +603,8 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) rte_memcpy(pkt, rte_pktmbuf_mtod(mbuf, void *), desc->len); + tx_bytes += desc->len; rte_pktmbuf_free(mbuf); count++; } - - tx_bytes += mbuf->pkt_len; } -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:12.517329434 +0100 +++ 0040-net-af_xdp-fix-use-after-free-in-zero-copy-Tx.patch 2025-07-18 20:29:10.917907291 +0100 @@ -1 +1 @@ -From a23bf7fde78b10afbbafda252f15495b26e010a9 Mon Sep 17 00:00:00 2001 +From f7b74c765d4fcace202c74ae2f26671f138145f9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a23bf7fde78b10afbbafda252f15495b26e010a9 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 4b781bd3fb..822936f615 100644 +index a4bacad9a4..257dd551a6 100644