Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1427270 > unrolled thread
| Started by | Tomasz Figa <tfiga@chromium.org> |
|---|---|
| First post | 2016-06-21 06:40 +0200 |
| Last post | 2016-06-21 19:30 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v4 3/8] iommu/rockchip: Fix allocation of bases array in driver probe Tomasz Figa <tfiga@chromium.org> - 2016-06-21 06:40 +0200
Re: [PATCH v4 3/8] iommu/rockchip: Fix allocation of bases array in driver probe Doug Anderson <dianders@chromium.org> - 2016-06-21 19:30 +0200
| From | Tomasz Figa <tfiga@chromium.org> |
|---|---|
| Date | 2016-06-21 06:40 +0200 |
| Subject | [PATCH v4 3/8] iommu/rockchip: Fix allocation of bases array in driver probe |
| Message-ID | <rMlDH-YU-7@gated-at.bofh.it> |
From: Shunqian Zheng <zhengsq@rock-chips.com>
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: cd6438c5f844 ("iommu/rockchip: Reconstruct to support multi slaves")
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
---
drivers/iommu/rockchip-iommu.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 53fa0d9..8a5bac7 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -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;
--
2.8.0.rc3.226.g39d4020
[toc] | [next] | [standalone]
| From | Doug Anderson <dianders@chromium.org> |
|---|---|
| Date | 2016-06-21 19:30 +0200 |
| Subject | Re: [PATCH v4 3/8] iommu/rockchip: Fix allocation of bases array in driver probe |
| Message-ID | <rMxES-lN-9@gated-at.bofh.it> |
| In reply to | #1427270 |
Hi,
On Mon, Jun 20, 2016 at 9:34 PM, Tomasz Figa <tfiga@chromium.org> wrote:
> From: Shunqian Zheng <zhengsq@rock-chips.com>
>
> 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: cd6438c5f844 ("iommu/rockchip: Reconstruct to support multi slaves")
>
> Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
> Signed-off-by: Tomasz Figa <tfiga@chromium.org>
> ---
> drivers/iommu/rockchip-iommu.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
Reviewed-by: Douglas Anderson <dianders@chromium.org>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web