[PATCH] iommu/rockchip: check return value of of_find_device_by_node() in rk_iommu_of_xlate()

Robin Murphy robin.murphy at arm.com
Thu Oct 29 06:08:01 EDT 2020


On 2020-10-29 09:22, Yu Kuai wrote:
> If of_find_device_by_node() failed in rk_iommu_of_xlate(), null pointer
> dereference will be triggered. Thus return error code if
> of_find_device_by_node() failed.

How can that happen? (Given that ".suppress_bind_attrs = true")

Robin.

> Fixes: 5fd577c3eac3("iommu/rockchip: Use OF_IOMMU to attach devices automatically")
> Signed-off-by: Yu Kuai <yukuai3 at huawei.com>
> ---
>   drivers/iommu/rockchip-iommu.c | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
> index e5d86b7177de..090d149ef8e9 100644
> --- a/drivers/iommu/rockchip-iommu.c
> +++ b/drivers/iommu/rockchip-iommu.c
> @@ -1099,6 +1099,9 @@ static int rk_iommu_of_xlate(struct device *dev,
>   
>   	iommu_dev = of_find_device_by_node(args->np);
>   
> +	if (!iommu_dev)
> +		return -ENODEV;
> +
>   	data->iommu = platform_get_drvdata(iommu_dev);
>   	dev_iommu_priv_set(dev, data);
>   
> 



More information about the Linux-rockchip mailing list