diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2015-08-28 10:42:09 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-10-03 17:36:45 +0200 |
| commit | 7e31210349e9e03a9a4dff31ab5f2bc83e8e84f5 (patch) | |
| tree | 49c74057b38524ea3243a1064a3c3e72a04c5b79 /arch/arm/mm/dma-mapping.c | |
| parent | ARM: 8426/1: dma-mapping: add missing range check in dma_mmap() (diff) | |
| download | linux-7e31210349e9e03a9a4dff31ab5f2bc83e8e84f5.tar.xz linux-7e31210349e9e03a9a4dff31ab5f2bc83e8e84f5.zip | |
ARM: 8427/1: dma-mapping: add support for offset parameter in dma_mmap()
IOMMU-based dma_mmap() implementation lacked proper support for offset
parameter used in mmap call (it always assumed that mapping starts from
offset zero). This patch adds support for offset parameter to IOMMU-based
implementation.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: stable@vger.kernel.org # v3.6+
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index c0865867ef0d..ad4eb2d26e16 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1418,6 +1418,8 @@ static int arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma, if (off >= nr_pages || (usize >> PAGE_SHIFT) > nr_pages - off) return -ENXIO; + pages += off; + do { int ret = vm_insert_page(vma, uaddr, *pages++); if (ret) { |