Skip to content

Commit 8b07e99

Browse files
iklimaszshenki
authored andcommitted
soc: aspeed: p2a-ctrl: Fix boundary check for mmap
The check mixes pages (vm_pgoff) with bytes (vm_start, vm_end) on one side of the comparison, and uses resource address (rather than just the resource size) on the other side of the comparison. This can allow malicious userspace to easily bypass the boundary check and map pages that are located outside memory-region reserved by the driver. Fixes: 01c60dc ("drivers/misc: Add Aspeed P2A control driver") Cc: stable@vger.kernel.org Signed-off-by: Iwona Winiarska <iwona.winiarska@intel.com> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> Tested-by: Andrew Jeffery <andrew@aj.id.au> Reviewed-by: Joel Stanley <joel@aj.id.au> Signed-off-by: Joel Stanley <joel@jms.id.au>
1 parent b49a0e6 commit 8b07e99

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/soc/aspeed/aspeed-p2a-ctrl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma)
110110
vsize = vma->vm_end - vma->vm_start;
111111
prot = vma->vm_page_prot;
112112

113-
if (vma->vm_pgoff + vsize > ctrl->mem_base + ctrl->mem_size)
113+
if (vma->vm_pgoff + vma_pages(vma) > ctrl->mem_size >> PAGE_SHIFT)
114114
return -EINVAL;
115115

116116
/* ast2400/2500 AHB accesses are not cache coherent */

0 commit comments

Comments
 (0)