From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB79D261B91; Wed, 4 Feb 2026 15:28:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770218928; cv=none; b=IB3g6lIEyW3byyljE0z5yJQIljGH44U6UEl1rf1pLuQGwIcuL6wmqA9FSn0ycDjXdF27orvFiHzLlGEnY33tcvm91sQT5+XGpIYhAPviaoYB2vBkpcNRwuvQDKnqdvpi0cDSKtD5947Q6bYVwc0hP8ajcoTeX+MhmYvf/evePfc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770218928; c=relaxed/simple; bh=onO1zxNOudpklcCbFDcagFQPh4GjaiMAzHK2KBewA2c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bqrcVc4h6Kwoi96MjAVydrTbQnlrY24i1pkFpuzt6qqhZT6u3dB63RiDblgW11iAI2rn4nUNJD3qGmctOFDAdqpp6shAhAX4vJ/iE5oGHGOWofVL1pQWT/pkrRp5nKXxq75a5xj6uDyZrKu8g0D/fsJnxalC4gUuSuEJY05Zkww= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zWJTWjqZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zWJTWjqZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0BEFC4CEF7; Wed, 4 Feb 2026 15:28:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770218928; bh=onO1zxNOudpklcCbFDcagFQPh4GjaiMAzHK2KBewA2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zWJTWjqZjKzSNct/pqqKkJALznixws2infxIrjTBNl5MPWbqG52uAMz0DK8MwACnU 46IQOEMqx023nbLlvjtTsrMn9wf47s6ep4UW0gYMqYfGdKm1Atec13FVCYalUrIRu2 PZme4F0hFr/3d+Crj32JAHvVdENaIGxuYQ3PXtRQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kery Qi , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 016/122] rocker: fix memory leak in rocker_world_port_post_fini() Date: Wed, 4 Feb 2026 15:39:58 +0100 Message-ID: <20260204143852.451331169@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143851.857060534@linuxfoundation.org> References: <20260204143851.857060534@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kery Qi [ Upstream commit 8d7ba71e46216b8657a82ca2ec118bc93812a4d0 ] In rocker_world_port_pre_init(), rocker_port->wpriv is allocated with kzalloc(wops->port_priv_size, GFP_KERNEL). However, in rocker_world_port_post_fini(), the memory is only freed when wops->port_post_fini callback is set: if (!wops->port_post_fini) return; wops->port_post_fini(rocker_port); kfree(rocker_port->wpriv); Since rocker_ofdpa_ops does not implement port_post_fini callback (it is NULL), the wpriv memory allocated for each port is never freed when ports are removed. This leads to a memory leak of sizeof(struct ofdpa_port) bytes per port on every device removal. Fix this by always calling kfree(rocker_port->wpriv) regardless of whether the port_post_fini callback exists. Fixes: e420114eef4a ("rocker: introduce worlds infrastructure") Signed-off-by: Kery Qi Reviewed-by: Simon Horman Link: https://patch.msgid.link/20260123211030.2109-2-qikeyu2017@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/rocker/rocker_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c index 36af94a2e062a..2794f75df8fcb 100644 --- a/drivers/net/ethernet/rocker/rocker_main.c +++ b/drivers/net/ethernet/rocker/rocker_main.c @@ -1524,9 +1524,8 @@ static void rocker_world_port_post_fini(struct rocker_port *rocker_port) { struct rocker_world_ops *wops = rocker_port->rocker->wops; - if (!wops->port_post_fini) - return; - wops->port_post_fini(rocker_port); + if (wops->port_post_fini) + wops->port_post_fini(rocker_port); kfree(rocker_port->wpriv); } -- 2.51.0