Validate alignment, 32-bit GPU extents, representable PFNs and tiled geometry before changing PTEs. Use u64 exclusive endpoints so the final GPU page does not wrap on i386. Reject overlapping tiled rows and invalid strides before division or allocation.
Signed-off-by: Gabriel Gama <[email protected]> --- diff --git a/drivers/gpu/drm/gma500/mmu.c b/drivers/gpu/drm/gma500/mmu.c index 76c05f5a260c9ca305e7ef9a12ffdc1f61c56482..b5854ed29c28cc33205e02018dc2e1ec505b0137 100644 --- a/drivers/gpu/drm/gma500/mmu.c +++ b/drivers/gpu/drm/gma500/mmu.c @@ -136,10 +136,9 @@ } -static inline unsigned long psb_pd_addr_end(unsigned long addr, - unsigned long end) -{ - addr = (addr + PSB_PDE_MASK + 1) & ~PSB_PDE_MASK; +static inline u64 psb_pd_addr_end(u64 addr, u64 end) +{ + addr = (addr + PSB_PDE_MASK + 1) & ~(u64)PSB_PDE_MASK; return (addr < end) ? addr : end; } @@ -484,13 +483,13 @@ struct psb_mmu_pt *pt; uint32_t rows = 1; uint32_t i; - unsigned long addr; - unsigned long end; - unsigned long next; - unsigned long add; - unsigned long row_add; + u64 addr; + u64 end; + u64 next; + u64 add; + u64 row_add; unsigned long clflush_add = pd->driver->clflush_add; - unsigned long clflush_mask = pd->driver->clflush_mask; + u64 clflush_mask = ~((u64)clflush_add - 1); if (!pd->driver->has_clflush) return; @@ -500,8 +499,8 @@ else desired_tile_stride = num_pages; - add = desired_tile_stride << PAGE_SHIFT; - row_add = hw_tile_stride << PAGE_SHIFT; + add = (u64)desired_tile_stride << PAGE_SHIFT; + row_add = (u64)hw_tile_stride << PAGE_SHIFT; mb(); for (i = 0; i < rows; ++i) { @@ -525,22 +524,53 @@ mb(); } +/* Validate the complete mapping before touching page tables. */ +static int psb_mmu_check_range(unsigned long address, u32 num_pages, + u32 desired_tile_stride, u32 hw_tile_stride) +{ + u64 span; + u32 rows; + + if (!IS_ALIGNED(address, PAGE_SIZE)) + return -EINVAL; + if (((u64)address >> 32) || num_pages > BIT(20)) + return -ERANGE; + if (!num_pages) + return 0; + + if (hw_tile_stride) { + if (!desired_tile_stride || + num_pages % desired_tile_stride || + hw_tile_stride < desired_tile_stride) + return -EINVAL; + rows = num_pages / desired_tile_stride; + span = (u64)(rows - 1) * hw_tile_stride + desired_tile_stride; + } else { + span = num_pages; + } + + if (span > (BIT_ULL(32) - address) >> PAGE_SHIFT) + return -ERANGE; + + return 0; +} + void psb_mmu_remove_pfn_sequence(struct psb_mmu_pd *pd, unsigned long address, uint32_t num_pages) { struct psb_mmu_pt *pt; - unsigned long addr; - unsigned long end; - unsigned long next; + u64 addr; + u64 end; + u64 next; unsigned long f_address = address; - if (!num_pages) + if (!num_pages || psb_mmu_check_range(address, num_pages, 0, 0)) return; down_read(&pd->driver->sem); addr = address; - end = addr + (num_pages << PAGE_SHIFT); + end = addr + ((u64)num_pages << PAGE_SHIFT); do { next = psb_pd_addr_end(addr, end); @@ -575,14 +605,15 @@ struct psb_mmu_pt *pt; uint32_t rows = 1; uint32_t i; - unsigned long addr; - unsigned long end; - unsigned long next; - unsigned long add; - unsigned long row_add; + u64 addr; + u64 end; + u64 next; + u64 add; + u64 row_add; unsigned long f_address = address; - if (!num_pages) + if (!num_pages || psb_mmu_check_range(address, num_pages, + desired_tile_stride, hw_tile_stride)) return; if (hw_tile_stride) @@ -590,8 +621,8 @@ else desired_tile_stride = num_pages; - add = desired_tile_stride << PAGE_SHIFT; - row_add = hw_tile_stride << PAGE_SHIFT; + add = (u64)desired_tile_stride << PAGE_SHIFT; + row_add = (u64)hw_tile_stride << PAGE_SHIFT; down_read(&pd->driver->sem); @@ -635,19 +666,22 @@ { struct psb_mmu_pt *pt; uint32_t pte; - unsigned long addr; - unsigned long end; - unsigned long next; + u64 addr; + u64 end; + u64 next; unsigned long f_address = address; - int ret = -ENOMEM; - - if (!num_pages) - return 0; + int ret; + + ret = psb_mmu_check_range(address, num_pages, 0, 0); + if (ret || !num_pages) + return ret; + if ((u64)start_pfn + num_pages > BIT_ULL(20)) + return -ERANGE; down_read(&pd->driver->sem); addr = address; - end = addr + (num_pages << PAGE_SHIFT); + end = addr + ((u64)num_pages << PAGE_SHIFT); do { next = psb_pd_addr_end(addr, end); @@ -687,27 +721,32 @@ uint32_t rows = 1; uint32_t i; uint32_t pte; - unsigned long addr; - unsigned long end; - unsigned long next; - unsigned long add; - unsigned long row_add; + u64 addr; + u64 end; + u64 next; + u64 add; + u64 row_add; unsigned long f_address = address; - int ret = -ENOMEM; - - if (!num_pages) - return 0; - - if (hw_tile_stride) { - if (num_pages % desired_tile_stride != 0) - return -EINVAL; + int ret; + + ret = psb_mmu_check_range(address, num_pages, + desired_tile_stride, hw_tile_stride); + if (ret || !num_pages) + return ret; + if (!pages) + return -EINVAL; + for (i = 0; i < num_pages; i++) { + if (!pages[i] || page_to_pfn(pages[i]) >= BIT_ULL(20)) + return -ERANGE; + } + + if (hw_tile_stride) rows = num_pages / desired_tile_stride; - } else { + else desired_tile_stride = num_pages; - } - - add = desired_tile_stride << PAGE_SHIFT; - row_add = hw_tile_stride << PAGE_SHIFT; + + add = (u64)desired_tile_stride << PAGE_SHIFT; + row_add = (u64)hw_tile_stride << PAGE_SHIFT; down_read(&pd->driver->sem); @@ -719,8 +758,10 @@ do { next = psb_pd_addr_end(addr, end); pt = psb_mmu_pt_alloc_map_lock(pd, addr); - if (!pt) + if (!pt) { + ret = -ENOMEM; goto out; + } do { pte = psb_mmu_mask_pte(page_to_pfn(*pages++), type);
