From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7822A36B044 for ; Sun, 5 Apr 2026 05:52:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775368373; cv=none; b=Asntb6UOcRJtQVFIsHR4AAyBu2DJsz2xOvxlC1QfBfcE2q1WTskCar3WK/GebI/oawYe02adEEIzb6eqxJn7ruePGfzbEiVyM2OjUQOWMHhuHpO6NgdnQbIQa0tLpVhVpMN++ud1Jku/L0SOg0ofKQPUxAcJESE1uw4tzun+9MI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775368373; c=relaxed/simple; bh=AcbCMRscvnlSYNTKITNZryCi2V7a4cYUyJMEAvQd/Ec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fh1aKthj3a+mIXldjIBph1bWzZg9OopGDmGnsXHl/Ui7+KtxXuE13pjo8MC7JsHTUVP/CSvfXIuFEsS/pvEnwIlPGYR45t8m+V31xh/frfInwZOsNNFLsC+W2GzZLYOz6lfp1yQ4+sZjB12/BPLHoL4mlor/tgzkF6gogBq2m5k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aF/dX01n; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aF/dX01n" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4853e1ce427so41077115e9.3 for ; Sat, 04 Apr 2026 22:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775368369; x=1775973169; darn=vger.kernel.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=Io37eMQXjFrNe5EGOk1T1EQBTG5MupuGxN8OBbeP41k=; b=aF/dX01nRH2bxQnsibtNB/5jDNxU2j4y0QCSWw3N6qFUxvVTuLnJPrG6FjgoQ8jpE0 02iB6NyJn7asVR+O0QlKp1Vb+UYXS4oHfc38k56M69vp1X1oKkeqlQovRKiMZTdUlXv2 sQg7IWpZDeQs+xA2n6iJP0FK7iezt+s8Fl9Q4Y1U2KIqSOUWNPBR4LO6uAJ2TWcU7N/5 hLWs3nViOpXbyqu+Dmm741PSbmZQr45qo/qkHSFbYHc2xG9jfj8gu35Fd8w0iogWVaD7 uFMxGntx1WfG5S6P/or+/cJDgtVFH3wsgKR2zby8K0i9AMHtrElepzxb0XuZs9lHtBPL OxiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775368369; x=1775973169; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Io37eMQXjFrNe5EGOk1T1EQBTG5MupuGxN8OBbeP41k=; b=gRuXREIrEUeMKLUT1kw1EdYpVYgssH9aWBZnDnco76OjIY2OobOfs8knOxQLP9c07b KRXvmaIDNAyd57keShkzC2dxL5pBsUt+NZQfAyzlaL82huxMK/m2P2DkQR0y7BOJOsB2 GkmvUrmNNT2Vq9RRU2ryLqbXmWMWUOVYo1IBSIgvdE988XtkSgw4f+gN1vkD1mmnhl1K uSb6ZW1Ut4H6xWcWEjmmw2W8t+iDwurxMwYen/FyI0tiVRiVOr5EKu+6fBpGoWQnYV6Y UXo3QqxlpGpLt47nYFxqpGkHf9mqIJ3G0n48wOXZpsb3zFMQksadQgzl9JG3bMR/OLDH iGVQ== X-Forwarded-Encrypted: i=1; AJvYcCU6GC/XC4F5emExAHzmOPTuwyYSkOG9uBl0paNT9ZPVie4SvV5xwaiUjJqC7y5gP/FCVc/AOkHkC2sIaEM=@vger.kernel.org X-Gm-Message-State: AOJu0YxtTtUzqR208OhCnuxWreMbdqZGL8SYTQDku484d3PGtqElCwKY w8pQJz5qsWnB+qjzH3kQgDOFiQ8YzgOjstT+ecSpUFh7MvDifJRlwWSK X-Gm-Gg: AeBDiesyE4HkHLBu/LkEhKuYBotP279oCIJK/mWaT3TNUL/WhKscJaNg1EC9aUIF3eB AOqklRdTdHmtAshzIR27Ez+/2GUfhdUXwKKiji6b2/td+4aIPp4DFGYfbpuHexwJacKHEIOHUaV /KHfIy130u8EYYmueulMx/ppua0FB5omcP08aUmD9dAjD139GR4eXQ0IoyzrdE7+6hRGW8x1lhi zPWfLumJeBSaIVbmUdSe+pKBNbBqAuXCx3USte0SAeJRa56Detaxw2xOXDe7NlBfj4fxJ0g85k0 GtsnCzg224aYsSh5FXzQMFlAQmGHW0JNhOr7l9GVZOWmn8U7UoK+djwPUFyFLuH8rkgJ8M+auJN K+7PjqbehQwcHudeZTMEK90CRw7JgakjaljCCnDIj5ZVId0W+A8UKmnSZQTUFDMm6Oryu2izAYp /UZKZ7LZdrKzA1LoBRWOuMuagVXl2aHnqeHBzgoROQrSPil4KP6LATQthDVxsQRcuFJYWm99g4X vQ5mceoP/UO X-Received: by 2002:a05:600c:46d5:b0:486:fdba:f5db with SMTP id 5b1f17b1804b1-488995d5fa9mr125286085e9.0.1775368368776; Sat, 04 Apr 2026 22:52:48 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48899e960a7sm55847465e9.27.2026.04.04.22.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Apr 2026 22:52:47 -0700 (PDT) From: David Carlier To: horatiu.vultur@microchip.com, UNGLinuxDriver@microchip.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, David Carlier Subject: [PATCH net v3 v3 2/3] net: lan966x: fix page pool leak in error paths Date: Sun, 5 Apr 2026 06:52:40 +0100 Message-ID: <20260405055241.35767-3-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260405055241.35767-1-devnexen@gmail.com> References: <20260405055241.35767-1-devnexen@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit lan966x_fdma_rx_alloc() creates a page pool but does not destroy it if the subsequent fdma_alloc_coherent() call fails, leaking the pool. Similarly, lan966x_fdma_init() frees the coherent DMA memory when lan966x_fdma_tx_alloc() fails but does not destroy the page pool that was successfully created by lan966x_fdma_rx_alloc(), leaking it. Add the missing page_pool_destroy() calls in both error paths. Fixes: 11871aba1974 ("net: lan96x: Use page_pool API") Cc: stable@vger.kernel.org Signed-off-by: David Carlier --- drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c b/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c index 74851c63e46a..10773fe93d4d 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c @@ -119,8 +119,10 @@ static int lan966x_fdma_rx_alloc(struct lan966x_rx *rx) return PTR_ERR(rx->page_pool); err = fdma_alloc_coherent(lan966x->dev, fdma); - if (err) + if (err) { + page_pool_destroy(rx->page_pool); return err; + } fdma_dcbs_init(fdma, FDMA_DCB_INFO_DATAL(fdma->db_size), FDMA_DCB_STATUS_INTR); @@ -957,6 +959,7 @@ int lan966x_fdma_init(struct lan966x *lan966x) err = lan966x_fdma_tx_alloc(&lan966x->tx); if (err) { fdma_free_coherent(lan966x->dev, &lan966x->rx.fdma); + page_pool_destroy(lan966x->rx.page_pool); return err; } -- 2.53.0