From af1469edbc6a967d8b2d00e16cc4cfc8cefffa54 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Tue, 24 Feb 2009 17:22:59 +0000 Subject: [PATCH] --- yaml --- r: 133445 b: refs/heads/master c: 6da2d377bba06c29d0bc41c8dee014164dec82a7 h: refs/heads/master i: 133443: c316b9bc275ab542f3a0dfffddd6e409b044dba5 v: v3 --- [refs] | 2 +- trunk/drivers/uio/uio.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b71f895b5a04..916ae0eedb83 100644 --- 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 index 68a496557788..03efb065455f 100644 --- 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;