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 628844615A for ; Sat, 1 Feb 2025 00:11:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 56E4F40291; Sat, 1 Feb 2025 00:11:28 +0100 (CET) Received: from mail-wr1-f97.google.com (mail-wr1-f97.google.com [209.85.221.97]) by mails.dpdk.org (Postfix) with ESMTP id F3344400EF for ; Sat, 1 Feb 2025 00:11:26 +0100 (CET) Received: by mail-wr1-f97.google.com with SMTP id ffacd0b85a97d-38be3bfb045so2479446f8f.0 for ; Fri, 31 Jan 2025 15:11:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; t=1738365086; x=1738969886; 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=goNQLdxV8GPZKjJhQxNbRZ11lznIXp+Qg3b9P4fWxQw=; b=iek6VHuaCBxoPPy0W7VwQODFnxeXcyI5kbAyGJQCIC/wEFt6HD6stEU0dSqgdJ1gTh tQdR04yN6LpWGutbAP5HVMq7qrp4oV70b9kczt5OLC08kImIIxr0oQI9zCk0EpsJuYaS YqbNLBD84YlcbqPddlYimMx/qLw2jDkr7W532t0EbPX8dTzUj8gCYLm1UyUpObitIPik KZX+LP+YwFQa/F7kJPgTNy3CtpIA/sGvQpF3jEj0W4PMk7lyL+PEZ6xZwF4AQfck25B+ FqDiDiaZOw2xtAl6F1zvLBXxBQcEZaSguPGFFWEBN5lJUmr5AVyZgYxyGCYhCUNfo0yb 4Xaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738365086; x=1738969886; 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=goNQLdxV8GPZKjJhQxNbRZ11lznIXp+Qg3b9P4fWxQw=; b=dvnyKqoTfHp9/5jpWxYfMMQAeJ1ZZ0poola/MWDy2X4cht1e+f2LbvwN8+yEZnQ6gn HYphb8v1kd504EKD0ZKEpTN14BSAOpz8CwNb5Mr0jcIqR8qrz9NXSZLQRj+pOqgtlH/e 3y0Z506xzWcD6BJKYtg4EWPhuBg0r6opsi6KVgpeYkY2P1zLrWp0mbJ/4+P9R93gmg8L IWiAw09wx+lhJax9A413/EysmtwuQeeSJ0BP5nqCJ3/PMiB2yavqpQMILQy0SFn5vF7R Ngml0GHIpLmA5TDvK6eduyCzPm6Zp6Poe37wtG2fsy46snl3JJRWWPNOIXZsceuvKW/d qy3Q== X-Gm-Message-State: AOJu0YzUcIOalZaN4mE2oSdEAozzvzE3Ljxte7ZUf4/iQ2gLHyEhSoAB 3T0bPuwrPL/d9oQ+aOQy+Hoqw+xD1OeRBzd28qsf669gWgETpCUZj9PFVVdde8+IeGBLsvKGwup BoudFLsJSX94x/D3SCLBusWDCtjeOs0hr X-Gm-Gg: ASbGncvIxJXDl1vcAcWKUJBVqqLCsqKcR81hC0yCtwAm4FsmLf7k0c62ibOsMFtm4XH ASctEUbXsAoVh/MoOOfquvAnds2EyaC1hR7DwP28Yp7i47pd45bM3MlQPhxxKI5GujKGspyQCIy rYZPH7PBrf5rRRihDVkErTiqbkzKmThDAcZA8CagVx9eDxqOisQ7oeACkijFirDc9aZkR3ufUUU DQkxSSaUU8IL5qfNu+boLRpfLKQYefGLoBbUnChzTXviS8E/yhmNkqab7kvAdG0P6uj5hKYRXlD 7rn9WPIy/Og1DrG0EplpKQ3pJfmvQp/HJItbl1tAHtzfXbJqHQ== X-Google-Smtp-Source: AGHT+IFJjAFJ7LlgnnpN9DSdIZy2V0AeNWExxLLi0P7rVox5vVhfbC1VHvlBHGcXEuCXC94Swj75m7efYd8b X-Received: by 2002:a05:6000:1f8e:b0:38a:49c1:8345 with SMTP id ffacd0b85a97d-38c60f65868mr4332442f8f.18.1738365086469; Fri, 31 Jan 2025 15:11:26 -0800 (PST) Received: from smtpservice.6wind.com ([185.13.181.2]) by smtp-relay.gmail.com with ESMTP id 5b1f17b1804b1-438e23e6e09sm5737185e9.26.2025.01.31.15.11.26; Fri, 31 Jan 2025 15:11:26 -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 601F819E12; Sat, 1 Feb 2025 00:11:26 +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 v6 1/2] net/af_xdp: Fix use after free in af_xdp_tx_zc Date: Sat, 1 Feb 2025 00:10:19 +0100 Message-Id: <20250131231018.2163893-2-ariel.otilibili@6wind.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20250116195640.68885-1-ariel.otilibili@6wind.com> References: <20250116195640.68885-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 76f65e5114d4..42fcefacf573 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