diff options
| author |   Ritesh Harjani <ritesh.harjani@gmail.com> | 2014-04-21 12:17:27 +0530 |
|---|---|---|
| committer |   Marek Szyprowski <m.szyprowski@samsung.com> | 2014-04-23 15:07:00 +0200 |
| commit | 59f0f119e85cfb173db518328b55efbac4087c9f (patch) | |
| tree | ce1fd9cb76f71d311b5aae727aa9045d636f0a9e /arch/arm/mm | |
| parent | Linux 3.15-rc2 (diff) | |
| download | linux-dev-59f0f119e85cfb173db518328b55efbac4087c9f.tar.xz linux-dev-59f0f119e85cfb173db518328b55efbac4087c9f.zip | |
arm: dma-mapping: Fix mapping size value
68efd7d2fb("arm: dma-mapping: remove order parameter from
arm_iommu_create_mapping()") is causing kernel panic
because it wrongly sets the value of mapping->size:
Unable to handle kernel NULL pointer dereference at virtual
address 000000a0
pgd = e7a84000
[000000a0] *pgd=00000000
...
PC is at bitmap_clear+0x48/0xd0
LR is at __iommu_remove_mapping+0x130/0x164
Fix it by correcting mapping->size value.
Signed-off-by: Ritesh Harjani <ritesh.harjani@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index f62aa0677e5c..6b00be1f971e 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1963,8 +1963,8 @@ arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, size_t size) mapping->nr_bitmaps = 1; mapping->extensions = extensions; mapping->base = base; - mapping->size = bitmap_size << PAGE_SHIFT; mapping->bits = BITS_PER_BYTE * bitmap_size; + mapping->size = mapping->bits << PAGE_SHIFT; spin_lock_init(&mapping->lock); |