Skip to contentSkip to conversation

Take offset into account when determining number of pages that can be mapped

PATCH New Ian Abbott 1 participant 1 message Feb 24, 2009 Userspace I/O (UIO)

lore
Share & tools
lore

Ian Abbott

author
#0 lore raw

PATCH 1/1 Take offset into account when determining number of pages that can be mapped

From: Ian Abbott <[email protected]>

If a UIO memory region does not start on a page boundary but straddles one, the number of actual pages that overlap the memory region may be calculated incorrectly because the offset isn't taken into account. If userspace sets the mmap length to offset+size, it may fail with -EINVAL if UIO thinks it's trying to allocate too many pages.

---

drivers/uio/uio.c +2 -1
diff -urp linux-2.6.29-rc6/drivers/uio/uio.c linux-2.6.29-rc6.new/drivers/uio/uio.c
@@ -686,7 +686,8 @@ static int uio_mmap(struct file *filep, 
 		return -EINVAL;
 
 	requested_pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
-	actual_pages = (idev->info->mem[mi].size + PAGE_SIZE -1) >> PAGE_SHIFT;
+	actual_pages = ((idev->info->mem[mi].addr & ~PAGE_MASK)
+			+ idev->info->mem[mi].size + PAGE_SIZE -1) >> PAGE_SHIFT;
 	if (requested_pages > actual_pages)
 		return -EINVAL;