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 56B39461BA for ; Fri, 7 Feb 2025 11:46:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4AFAF42D2E; Fri, 7 Feb 2025 11:46:07 +0100 (CET) Received: from mail-wm1-f99.google.com (mail-wm1-f99.google.com [209.85.128.99]) by mails.dpdk.org (Postfix) with ESMTP id 18DEB4281D for ; Fri, 7 Feb 2025 11:46:04 +0100 (CET) Received: by mail-wm1-f99.google.com with SMTP id 5b1f17b1804b1-4361f796586so22065635e9.3 for ; Fri, 07 Feb 2025 02:46:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; t=1738925164; x=1739529964; 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=v3I7jCrKETSj3/L0HlS4YyY1/dtNd2JFp3mVOspgfB0=; b=NJa8BJco9kSJb38Fvt/H/ZV8GhUkkY1PT3h8Q4wRw28oe5cTWHyZvK3rHV/HK1qigN lIRO4t3dKtzPS+rGLHajfIxsbvuPw0X3d2+F5TaKvR24mv1g8fUHL3f9sm8u/SP2cfdy d2c/EHZA1ZEy2fFFH0eZH4VmNSyiFnTe2WBuYeLSeERHbWoi8dUwls9FPG4Mg52CXybv edOpRS6x4JP61sIYmMfcdysQ2TlfeVm4X6eYyQ1FUjKKdDGNcGcX6+W8Gkczw7M+Rpuy uDd9eZfZOUbdMNpuix1qBYR2bpUtM+5Ufqq7Nua72ZODk7EXdpF4vdckFwdBspxXQu6H 0UOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738925164; x=1739529964; 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=v3I7jCrKETSj3/L0HlS4YyY1/dtNd2JFp3mVOspgfB0=; b=kLsk2ajIFpgeLTSKcXtSOX1OfUgpMAerakAb7rI8cPzJrIlIXn9+jm5472gFLUcoXX cEGhOAQdq0zQMDqug+dT123Wkf482tNAg8/wFrv8Yc/z//fNU5sDl4j7D0D34jkD2qLG yacNuKtSjNZIA+LEfStL4Ly/X/qvM45j+2ArtMldOzQAtNqq32c3CfIsmVEhCSqrUN2v 18U7/Axn/uDr6jxYEgHvD7WIvU7Cncp8SnOaI/l/p01WQKwXlj3I9EpN32bsTA0aKTIM rLgttyxJzRegEGal1l+5jZ9W24qeoFtcXhV3ZJXhGJd5+eXQOPh1Alv5XXkqn3Vz59KL F9dQ== X-Gm-Message-State: AOJu0Yw8Va1BUzMEkBNA/8za43IoJWP11BbOWV9KYdLb7RbL5AAClcBL 7GPT1ibC7l5esdmLfrOzgwuRzdeqOeS17y9Jvv/+qfi+vg5XRLkCenmshKBX+k0amK6zOQpl+0C 64sls8D7fnogNBM6Guaw7sTLozwKMsX0q X-Gm-Gg: ASbGncvxYQ2GJQHVef/bRN6upSUQWRNkQkmSfSxDAQwOATSDKgya92JDaMGVLU3W+yo OVVY1Hg6/7VDBaHKS8tneujjv4ebwueMfw7NDZqpjq+evIDvc2uQVhNILJ+rJIC+ybV4l5VRIZx xcVdPHz/bGgVOA5plm4NHKXhSLbaoeIboDguYePn04WcTdxAFFbaBAe1x/W9wOAU2LspSXn3FG3 YhymHcpPz5waDQeHuSRU+NiwyuFvF2PeQzKX2bZ64tF4cMdBuhK2Vs+MYHhCsCnVqm0NqnL721t ghcyBC6JeROpiWGEmbE933Ee8L5vzDpnw8xepmAoV78A/6cEKw== X-Google-Smtp-Source: AGHT+IFysAxDQDDBJOMFpR7kY6KoX5UVaWn1gnkQVKS78fdftzW8gnwKmefz/FqH1wVjkC/GKPM5i/ua/PX9 X-Received: by 2002:a5d:47ce:0:b0:38d:c037:9352 with SMTP id ffacd0b85a97d-38dc8fe6a75mr2340474f8f.25.1738925163713; Fri, 07 Feb 2025 02:46:03 -0800 (PST) Received: from smtpservice.6wind.com ([185.13.181.2]) by smtp-relay.gmail.com with ESMTP id a640c23a62f3a-ab7732e28a5sm11750266b.134.2025.02.07.02.46.03; Fri, 07 Feb 2025 02:46:03 -0800 (PST) X-Relaying-Domain: 6wind.com Received: from localhost (rainbow.dev.6wind.com [10.17.1.165]) by smtpservice.6wind.com (Postfix) with ESMTP id 790901D386; Fri, 7 Feb 2025 11:46:03 +0100 (CET) From: Ariel Otilibili To: dev@dpdk.org Cc: stable@dpdk.org, Thomas Monjalon , David Marchand , Stephen Hemminger , Maryam Tahhan , Ciara Loftus , Ariel Otilibili Subject: [PATCH v9 1/2] net/af_xdp: Fix use after free in af_xdp_tx_zc Date: Fri, 7 Feb 2025 11:45:51 +0100 Message-Id: <20250207104552.1663519-2-ariel.otilibili@6wind.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20250207104552.1663519-1-ariel.otilibili@6wind.com> References: <20250116195640.68885-1-ariel.otilibili@6wind.com> <20250207104552.1663519-1-ariel.otilibili@6wind.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 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 9209a716e047..dbc6b9bdda30 100644 --- a/.mailmap +++ b/.mailmap @@ -134,7 +134,7 @@ Anupam Kapoor Apeksha Gupta Archana Muniganti Archit Pandey -Ariel Otilibili +Ariel Otilibili Arkadiusz Kubalewski Arkadiusz Kusztal Arnaud Fiorini diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index 814398ba4b44..092bcb73aa0a 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -574,6 +574,7 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) umem->mb_pool->header_size; offset = offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT; desc->addr = addr | offset; + tx_bytes += desc->len; count++; } else { struct rte_mbuf *local_mbuf = @@ -601,11 +602,10 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) desc->addr = addr | offset; rte_memcpy(pkt, rte_pktmbuf_mtod(mbuf, void *), desc->len); + tx_bytes += desc->len; rte_pktmbuf_free(mbuf); count++; } - - tx_bytes += mbuf->pkt_len; } out: -- 2.30.2