---

yaml --- r: 133445 b: refs/heads/master c: 6da2d37 h: refs/heads/master i: 133443: c316b9b v: v3
git-mirror · Mar 24, 2009 · af1469e · af1469e
1 parent ca53cfd
commit af1469e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bafeb378e915f39b1bf44ee0871823d6f402ea5
+refs/heads/master: 6da2d377bba06c29d0bc41c8dee014164dec82a7
diff --git a/trunk/drivers/uio/uio.c b/trunk/drivers/uio/uio.c
@@ -708,7 +708,8 @@ static int uio_mmap(struct file *filep, struct vm_area_struct *vma)
 		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;