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 CB4F2462CC for ; Wed, 26 Feb 2025 20:55:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C1BE340395; Wed, 26 Feb 2025 20:55:49 +0100 (CET) Received: from mail-lf1-f100.google.com (mail-lf1-f100.google.com [209.85.167.100]) by mails.dpdk.org (Postfix) with ESMTP id 0197340648 for ; Wed, 26 Feb 2025 20:55:48 +0100 (CET) Received: by mail-lf1-f100.google.com with SMTP id 2adb3069b0e04-5461dab4bfdso137338e87.3 for ; Wed, 26 Feb 2025 11:55:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; t=1740599748; x=1741204548; 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=3gjWwstkPyJjBBCYsBY0uVtHQOjQfzbSuqE7Eb2knZ4=; b=aJTENAIP8At9KgUHoe5fDXXjPHtsJA+US3WhiVaYlOTDbhhdMktXBLqNUTQPbPV34a CUYmc31rjzVrXZGNzlh17q0AlHIHdXy5S7R4ivKXBBM6YuTcHdPbz7wYV72OMEWBnMzE WsYp3RktmlPENLd5OGx28wohrsyOR+qccBpTS35VArzThAnU73Z/Ne4bKa0bRdTKEmVb iZbSLNohlHjXb+5sGsnJ0y9RLDtJ0Ypoe5jqYcql/Pqmnvgj466d0lFqwL4ciaVQG9ie W08yO0xS7t8CuypVeqoPpYvfRBck/cwcAW26D2pdQEO197AtSnuaZ4yZe80al/U4kfAd 23VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740599748; x=1741204548; 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=3gjWwstkPyJjBBCYsBY0uVtHQOjQfzbSuqE7Eb2knZ4=; b=c4kyy7w1WQ59PHoqICNWgIkuW/DIGozTwqZKQaERrKhL2wNgEZhfNiDBlZIvEw4QH1 CblbHeUp3Zi2Zk2S5PvZ11pWc2GPZvdlOdW2DpKrnft/v7nDi2YP1BrjIBZY8CB1XTB/ be7oBDcE+CixUzCV4N25lhJ8KGUBKg6v7hQW/uXDjea0sJjZ2YSJBbQZaUPAnNUnvEGz yPqSFkx+yw2Cm2LsoLgzrRD0Zr6UFrkIMFENFn6Gwwb6um4OoxClo1T+405kzLEAz8m3 +DqEYyUHCOD7q3diuUjYIQs23rW0yz3k/uTAAELpZ6uADV/9Okx37/RR6eOBELkQjWZW cshg== X-Forwarded-Encrypted: i=1; AJvYcCVpw4uKgBULo2FmunhUosxrjrvYoTGrhMl73EA3GTrIugq19g9sq0gboVQo2kqSLk3o81GU4c8=@dpdk.org X-Gm-Message-State: AOJu0YwIkwbnjRRgEpl21aB03GJs/bUsGNL9I0U4FXBz5toea6K++174 tAH71sPBilHrEljM1mzmTl9i+wxbdfTDWJYGae8TVr6M4AW0oVkSY3WHPwOmhYeD7Ke/c1bq63f l+AyY+CUFyYip/g1Gs/+9NQbcoVQdPsRI X-Gm-Gg: ASbGncs6k+eYZKERdADBMdTGezAIrDE4guDbNdiHYyWwnPck4I6uigDHo2U+MsPo8/u +On/v8fvHqsbzls/LV+c1Uv0msagNpt6P9fLe+tdf9fA0VUht9LvIrBJLG7mLg5qsgabDftMkgB F2JseyUFIiCWRXCc8xwWgAeB68t5jYp/yTos0hwCi37hdqJS0OtIfLM9nkmoRPeM4Bkny5Bu7Rp GipAN7TBolz04zmd5xajYTL+10mSRGcd6f0LLPV2QUQnd+JqJtWRK15WC8rzyqlE6EUz/89fSmw anABYv/VdxlDAwxkH6PATd6HDJRw8HesHIKmNguKtSFhqDwN1Rdo7odNs7vo X-Google-Smtp-Source: AGHT+IE96vTwebHSrCVfVItNb6vtXxCP5bKyLb8kEXs6drPWJNnZuCylkOdslcavkBX+b7iwIpQPvhh8mWQ4 X-Received: by 2002:a05:6512:3183:b0:542:29b6:9c26 with SMTP id 2adb3069b0e04-54838f5b6f6mr11059449e87.47.1740599748361; Wed, 26 Feb 2025 11:55:48 -0800 (PST) Received: from smtpservice.6wind.com ([185.13.181.2]) by smtp-relay.gmail.com with ESMTP id 2adb3069b0e04-548514f161csm168553e87.84.2025.02.26.11.55.48; Wed, 26 Feb 2025 11:55:48 -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 F3455175F0; Wed, 26 Feb 2025 20:55:47 +0100 (CET) From: Ariel Otilibili To: dev@dpdk.org Cc: Thomas Monjalon , David Marchand , stable@dpdk.org, Stephen Hemminger , Ciara Loftus , Maryam Tahhan , Ariel Otilibili Subject: [PATCH v11 1/2] net/af_xdp: Fix use after free in af_xdp_tx_zc Date: Wed, 26 Feb 2025 20:55:03 +0100 Message-Id: <20250226195504.2340737-2-ariel.otilibili@6wind.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20250226195504.2340737-1-ariel.otilibili@6wind.com> References: <20250116195640.68885-1-ariel.otilibili@6wind.com> <20250226195504.2340737-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 a03d3cfb591b..ea68d6180ccc 100644 --- a/.mailmap +++ b/.mailmap @@ -135,7 +135,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