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 7F4A02DF719; Tue, 6 Jan 2026 17:34:06 +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=1767720846; cv=none; b=qbDRBM4ygmbRb604l8BgSesIoKQz75FdIyuod34854yGmp5kDELSa3hJGUGtaxYdOxK/j/QBFTyF+VhB/X0wTuUW8EOgY02uFnZk9RUS+toOpNn9pJpRedsjg753eAuuagcQKtpilIF3QHWdY/sJXNNTNbNdgdgNAENMRhJUn+M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767720846; c=relaxed/simple; bh=ENZsN/uGd63xpnybB54E9eVg+h5NIgIvQx9VsMYz46Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QJaWM8s1KIiWAa3llWqPFFt7+hMQ5mb7ZcKlYUwQr+k/h791iCmmWHjDzEnupy1HJKmgNtbgPw4KTNhqJAbIAa3ohyWVn4QtBfeH7APnK7odRkWkSEDE1iU6e7Md/PeNsoJGGk8FNaoiY70HK4UnX56FVxq3FnyggDM2fkJZPgU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bHyQUMQq; 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="bHyQUMQq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC4DBC116C6; Tue, 6 Jan 2026 17:34:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767720846; bh=ENZsN/uGd63xpnybB54E9eVg+h5NIgIvQx9VsMYz46Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bHyQUMQqXizYOb0xF1gRpUEIGA4/bbMlP2OrfOXFYLxQBmHtmK/IK5Se598J2OGMm JfjNmE57fklkPQ8bC/h2gX+lgLcOShEYeu9yQ6cuitTO+6oAhvxSfAc5eO9nLc4MYR 9zsL3o4mV/BUidO0cJAVhyLmAMSiwdK1x5RQZetA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Honghui Zhang , Robin Murphy , Johan Hovold , AngeloGioacchino Del Regno , Joerg Roedel Subject: [PATCH 6.12 360/567] iommu/mediatek-v1: fix device leaks on probe() Date: Tue, 6 Jan 2026 18:02:22 +0100 Message-ID: <20260106170504.653989773@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260106170451.332875001@linuxfoundation.org> References: <20260106170451.332875001@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold commit 46207625c9f33da0e43bb4ae1e91f0791b6ed633 upstream. Make sure to drop the references taken to the larb devices during probe on probe failure (e.g. probe deferral) and on driver unbind. Fixes: b17336c55d89 ("iommu/mediatek: add support for mtk iommu generation one HW") Cc: stable@vger.kernel.org # 4.8 Cc: Honghui Zhang Acked-by: Robin Murphy Signed-off-by: Johan Hovold Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/mtk_iommu_v1.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c @@ -647,8 +647,10 @@ static int mtk_iommu_v1_probe(struct pla struct platform_device *plarbdev; larbnode = of_parse_phandle(dev->of_node, "mediatek,larbs", i); - if (!larbnode) - return -EINVAL; + if (!larbnode) { + ret = -EINVAL; + goto out_put_larbs; + } if (!of_device_is_available(larbnode)) { of_node_put(larbnode); @@ -658,11 +660,14 @@ static int mtk_iommu_v1_probe(struct pla plarbdev = of_find_device_by_node(larbnode); if (!plarbdev) { of_node_put(larbnode); - return -ENODEV; + ret = -ENODEV; + goto out_put_larbs; } if (!plarbdev->dev.driver) { of_node_put(larbnode); - return -EPROBE_DEFER; + put_device(&plarbdev->dev); + ret = -EPROBE_DEFER; + goto out_put_larbs; } data->larb_imu[i].dev = &plarbdev->dev; @@ -674,7 +679,7 @@ static int mtk_iommu_v1_probe(struct pla ret = mtk_iommu_v1_hw_init(data); if (ret) - return ret; + goto out_put_larbs; ret = iommu_device_sysfs_add(&data->iommu, &pdev->dev, NULL, dev_name(&pdev->dev)); @@ -696,12 +701,17 @@ out_sysfs_remove: iommu_device_sysfs_remove(&data->iommu); out_clk_unprepare: clk_disable_unprepare(data->bclk); +out_put_larbs: + for (i = 0; i < MTK_LARB_NR_MAX; i++) + put_device(data->larb_imu[i].dev); + return ret; } static void mtk_iommu_v1_remove(struct platform_device *pdev) { struct mtk_iommu_v1_data *data = platform_get_drvdata(pdev); + int i; iommu_device_sysfs_remove(&data->iommu); iommu_device_unregister(&data->iommu); @@ -709,6 +719,9 @@ static void mtk_iommu_v1_remove(struct p clk_disable_unprepare(data->bclk); devm_free_irq(&pdev->dev, data->irq, data); component_master_del(&pdev->dev, &mtk_iommu_v1_com_ops); + + for (i = 0; i < MTK_LARB_NR_MAX; i++) + put_device(data->larb_imu[i].dev); } static int __maybe_unused mtk_iommu_v1_suspend(struct device *dev)