diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2015-08-28 09:41:39 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-01-05 16:23:32 +0100 |
| commit | 3e8936ea3ce4c67f1d129bc7e76aaf19fa45a976 (patch) | |
| tree | ac4f34a782de321f6e204e78cfd07e36701fada9 /arch/arm | |
| parent | 941cb9aa8099c21a05a35fed257ae9c144ff536d (diff) | |
| download | lwn-3e8936ea3ce4c67f1d129bc7e76aaf19fa45a976.tar.gz lwn-3e8936ea3ce4c67f1d129bc7e76aaf19fa45a976.zip | |
ARM: 8426/1: dma-mapping: add missing range check in dma_mmap()
commit 371f0f085f629fc0f66695f572373ca4445a67ad upstream.
dma_mmap() function in IOMMU-based dma-mapping implementation lacked
a check for valid range of mmap parameters (offset and buffer size), what
might have caused access beyond the allocated buffer. This patch fixes
this issue.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 79cff8fdbaf3..f817f3064d67 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1378,12 +1378,17 @@ static int arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma, unsigned long uaddr = vma->vm_start; unsigned long usize = vma->vm_end - vma->vm_start; struct page **pages = __iommu_get_pages(cpu_addr, attrs); + unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT; + unsigned long off = vma->vm_pgoff; vma->vm_page_prot = __get_dma_pgprot(attrs, vma->vm_page_prot); if (!pages) return -ENXIO; + if (off >= nr_pages || (usize >> PAGE_SHIFT) > nr_pages - off) + return -ENXIO; + do { int ret = vm_insert_page(vma, uaddr, *pages++); if (ret) { |