aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew G. Harvey <agh@cisco.com>2008-09-23 19:10:02 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-16 12:24:54 -0400
commit02683ffdf655b4ae15245376ba6fea6d9e5829a6 (patch)
tree9b66a97df10db3d09be94e90b90f1e3b6eaa4934 /drivers
parenta6030fcc608bd333c80eab3bfc72f63906476c61 (diff)
UIO: Fix mapping of logical and virtual memory
mmap() doesn't work as expected for UIO_MEM_LOGICAL or UIO_MEM_VIRTUAL mappings. The offset into the memory needs to be added, otherwise uio_vma_fault always returns the first page only. Note that for UIO userspace calls mmap() with offset = N * getpagesize() to access mapping N. This must be compensated when calculating the offset. A comment was added to explain this since it is not obvious. Signed-off-by: Andrew G. Harvey <agh@cisco.com> Signed-off-by: Hans J. Koch <hjk@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/uio/uio.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 557e73ef5884..5dccf057a7dd 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -490,15 +490,23 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
490{ 490{
491 struct uio_device *idev = vma->vm_private_data; 491 struct uio_device *idev = vma->vm_private_data;
492 struct page *page; 492 struct page *page;
493 unsigned long offset;
493 494
494 int mi = uio_find_mem_index(vma); 495 int mi = uio_find_mem_index(vma);
495 if (mi < 0) 496 if (mi < 0)
496 return VM_FAULT_SIGBUS; 497 return VM_FAULT_SIGBUS;
497 498
499 /*
500 * We need to subtract mi because userspace uses offset = N*PAGE_SIZE
501 * to use mem[N].
502 */
503 offset = (vmf->pgoff - mi) << PAGE_SHIFT;
504
498 if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL) 505 if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL)
499 page = virt_to_page(idev->info->mem[mi].addr); 506 page = virt_to_page(idev->info->mem[mi].addr + offset);
500 else 507 else
501 page = vmalloc_to_page((void*)idev->info->mem[mi].addr); 508 page = vmalloc_to_page((void *)idev->info->mem[mi].addr
509 + offset);
502 get_page(page); 510 get_page(page);
503 vmf->page = page; 511 vmf->page = page;
504 return 0; 512 return 0;