]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iommu/qcom: add missing put_device() call in qcom_iommu_of_xlate()
authorYu Kuai <yukuai3@huawei.com>
Tue, 29 Sep 2020 01:40:37 +0000 (09:40 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:07:46 +0000 (10:07 +0100)
[ Upstream commit e2eae09939a89e0994f7965ba3c676a5eac8b4b0 ]

if of_find_device_by_node() succeed, qcom_iommu_of_xlate() doesn't have
a corresponding put_device(). Thus add put_device() to fix the exception
handling for this function implementation.

Fixes: 0ae349a0f33f ("iommu/qcom: Add qcom_iommu")
Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20200929014037.2436663-1-yukuai3@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/iommu/qcom_iommu.c

index d176df569af8fae92c7fd26628d3a4d6c480c463..78d813bd0dcc8a2d6bb899130fc3169a463775bc 100644 (file)
@@ -578,8 +578,10 @@ static int qcom_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)
         * index into qcom_iommu->ctxs:
         */
        if (WARN_ON(asid < 1) ||
-           WARN_ON(asid > qcom_iommu->num_ctxs))
+           WARN_ON(asid > qcom_iommu->num_ctxs)) {
+               put_device(&iommu_pdev->dev);
                return -EINVAL;
+       }
 
        if (!dev_iommu_priv_get(dev)) {
                dev_iommu_priv_set(dev, qcom_iommu);
@@ -588,8 +590,10 @@ static int qcom_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)
                 * multiple different iommu devices.  Multiple context
                 * banks are ok, but multiple devices are not:
                 */
-               if (WARN_ON(qcom_iommu != dev_iommu_priv_get(dev)))
+               if (WARN_ON(qcom_iommu != dev_iommu_priv_get(dev))) {
+                       put_device(&iommu_pdev->dev);
                        return -EINVAL;
+               }
        }
 
        return iommu_fwspec_add_ids(dev, &asid, 1);