Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d08f434 authored by Shunqian Zheng's avatar Shunqian Zheng Committed by Joerg Roedel
Browse files

iommu/rockchip: Fix allocation of bases array in driver probe 



In .probe(), devm_kzalloc() is called with size == 0 and works only
by luck, due to internal behavior of the allocator and the fact
that the proper allocation size is small. Let's use proper value for
calculating the size.

Fixes: cd6438c5 ("iommu/rockchip: Reconstruct to support multi slaves")

Signed-off-by: default avatarShunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: default avatarTomasz Figa <tfiga@chromium.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent e6d0f473

drivers/iommu/rockchip-iommu.c

+4 −2
Original line number Diff line number Diff line
@@ -1034,6 +1034,7 @@ static int rk_iommu_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct rk_iommu *iommu;

	struct resource *res;

	int num_res = pdev->num_resources;

	int i;



	iommu = devm_kzalloc(dev, sizeof(*iommu), GFP_KERNEL);
@@ -1043,12 +1044,13 @@ static int rk_iommu_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, iommu);

	iommu->dev = dev;

	iommu->num_mmu = 0;

	iommu->bases = devm_kzalloc(dev, sizeof(*iommu->bases) * iommu->num_mmu,



	iommu->bases = devm_kzalloc(dev, sizeof(*iommu->bases) * num_res,

				    GFP_KERNEL);

	if (!iommu->bases)

		return -ENOMEM;



	for (i = 0; i < pdev->num_resources; i++) {

	for (i = 0; i < num_res; i++) {

		res = platform_get_resource(pdev, IORESOURCE_MEM, i);

		if (!res)

			continue;