From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 3D3F03148D3 for ; Wed, 17 Jun 2026 05:51:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781675507; cv=none; b=NkAghPFwdXvvSww/eS+sDLaLUuGyGVntnZcsz8F5Q8cv712pE5+cSU2eiMZg7q7xJ4JZhpKT7W0lZlnXJcn2TcuxbWbmCRJKI4R39e27+a9cXwbsNKGcdjay1j4ZF0AYO7LIXs0DxrKDqgKLSU6TPORS8SuEt+/KOdosIFsgrkU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781675507; c=relaxed/simple; bh=qfvNln0pa11e9mwon0McWuzEQCAc/DCyJ5DN/ZvHcGQ=; h=From:To:Cc:Subject:Date:Message-ID:Content-Type:MIME-Version; b=XGlSEnDm5KgcCBbzYTCdkqcc/9ghM61ygtogIldw1RnuRadd4QfNYfA7B/TcBGtM544mck5I1mTk0LqlstNV9EXoSacti4nNbMPyhU5XLm7+MoN/5uAA2J7bKvfraDgAc5TiXjpsgYLpOcjFW7lRSdVau4sEuXq7BwMbrAfI1O0= 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=VMZt9jKe; arc=none smtp.client-ip=209.85.210.169 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="VMZt9jKe" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-84230ab8857so2494946b3a.1 for ; Tue, 16 Jun 2026 22:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781675505; x=1782280305; darn=vger.kernel.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=kkxqiQ4zP5GBX+kUzVlvAXk0Z7GWlJPzsDOx8k6B79A=; b=VMZt9jKemKDe3PBHJW8rwQvz475AGvIfxNxO6QVRDmhd1O//yxITWE+Qg8PSGIaRO8 q9ZocFYlIVDNnR1lQ6T1OsBZgBAQwxgo9AN6RS4EL+GKh3P5PHiOhmlnHiXcH1fR3GiI yUc81iD0pCNiJ5jznnqkEtPCQlzeUBpVrxF/NmTeMDE9ffZKIfzhtpUSQzL1F0YSaSQi YlsArwG+IX6QhSGys1gxq9k/mM2c2uh3nRFTCEtVUzbFmsA4J6PnzTTUXVw6ZOSKNzS+ DEnhxY+KNe2AeDeNUDhDLkEy7dU67QJIvBWo/MVGGPHJtrTzyGT6wsIjBC/J0gh16yYZ h1Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781675505; x=1782280305; h=mime-version:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kkxqiQ4zP5GBX+kUzVlvAXk0Z7GWlJPzsDOx8k6B79A=; b=EDuUfvA9zZXV90DSCgjfRo5w73CmL48tpMv4SLJ7ZM0MXCSPNBI4Az7zzxjW6AUwWR +4QLaZh0ZHau66J/JTO5wMsMeY+bdrczFaxmV0hiK7a59PRmRPSZDW/aPvTloDpwxvQ2 gudj6zBvx/7peUV6DR5xRF03vIAUyt4/AVt0fKDwyl/9YbHgxmeZwCBqmXiiV+gQ+w5j RC/WRGQm4vUgAbitWi+34sYJq9ebDmk9aMEg0/d3hj3lOG3qaPQi+8NunKWsqpM5zQS+ +56nwy+KoxKBpUz24wgwBuZA3k4vuf9N9uqj1TtFXGrQ+HmAWf5WkfRfXwkb47k79/tP wyRw== X-Gm-Message-State: AOJu0YyvhksNqKThjPzjpW53tMOgKRdDofAg5aV2+YOWW2WzyEoX7f1o FSrWWNhVr46WUvxCBnvTmJfvYkhHXGIyO/dsSiCOpvuQEkyeNXLMr6j4nWyuxxfFgZ89Ng== X-Gm-Gg: Acq92OHg+udZuC7o3yOx9TrjKigoE0oJNCvnapjS/FsPD+VqBFvRqZU6w9lbSELXTRD mQw7UBo7YSo0sTKO/qhDbx2qM1934+ejJ48JwcRu/w4p7ZBAeSCR016XtvTuISeVH5loXBRMxZ2 MKYPpcj7XqCprjvNADBYUyoAUSPhBfMHjTbwtVCdcZsgTHlJCvLWJvPe/Id4Duy+iCBfYMGaFGk q36k0teuHJQjQORKSZc4X5EDCWwi2MF6aFv+/0kYSdZpR7qgbGCCjw93GKlTaUP3c9G23LoD1XW 5WJ7tGVd+pOtJAMPmErhg1CQdEJJBLjzxIfEhhuIQCyAQbVVwJQn0phDSF5OiEEoFN1O+2/rEHL X8PXZAXleE/GBhlDDlt0SKIMVK/rqr9d62vCpBeIT+GKnJKDyd4qUYDZSeWaTVTbpnyVqcj5Cas oeZgyKug== X-Received: by 2002:a05:6a00:3925:b0:839:9ad:ee31 with SMTP id d2e1a72fcca58-84524444c85mr2332894b3a.8.1781675505554; Tue, 16 Jun 2026 22:51:45 -0700 (PDT) Received: from [127.0.1.1] ([47.253.114.73]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8434ac9dc87sm13810534b3a.4.2026.06.16.22.51.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2026 22:51:45 -0700 (PDT) From: Wayen Yan To: netdev@vger.kernel.org Cc: lorenzo@kernel.org, horms@kernel.org, pabeni@redhat.com, kuba@kernel.org, edumazet@google.com, andrew+netdev@lunn.ch, angelogioacchino.delregno@collabora.com, matthias.bgg@gmail.com, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH net] net: ethernet: mtk_ppe: Fix rhashtable leak in mtk_ppe_init error paths Date: Wed, 17 Jun 2026 13:48:13 +0800 Message-ID: <178167550101.2217645.14579307712717502425@gmail.com> Content-Type: text/plain; charset=utf-8 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In mtk_ppe_init(), when accounting is enabled, the error paths for dmam_alloc_coherent(mib) and devm_kzalloc(acct) failures return NULL directly, bypassing the err_free_l2_flows label that destroys the rhashtable initialized earlier. While this leak only occurs during probe (not runtime) and the leaked memory is minimal (an empty rhash table), fixing it ensures proper error path cleanup consistency. Fix by changing the two return NULL statements to goto err_free_l2_flows. Fixes: 603ea5e7ffa7 ("net: ethernet: mtk_eth_soc: fix memory leak in error path") Signed-off-by: Wayen Yan --- drivers/net/ethernet/mediatek/mtk_ppe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c index 18279e2a70..8451dc3fd0 100644 --- a/drivers/net/ethernet/mediatek/mtk_ppe.c +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c @@ -918,7 +918,7 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, int index) mib = dmam_alloc_coherent(ppe->dev, MTK_PPE_ENTRIES * sizeof(*mib), &ppe->mib_phys, GFP_KERNEL); if (!mib) - return NULL; + goto err_free_l2_flows; ppe->mib_table = mib; @@ -926,7 +926,7 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, int index) GFP_KERNEL); if (!acct) - return NULL; + goto err_free_l2_flows; ppe->acct_table = acct; } -- 2.51.0