diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-24 15:32:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-24 15:32:55 -0500 |
| commit | 10bb10dcb685cbe078e611f2dca3bd3e42fba0a8 (patch) | |
| tree | 79303391de7ed61a5c55b3599e386ee062e758ea /drivers | |
| parent | 3bf395994da5c238c37e281b50a5dd5f2532dc0c (diff) | |
| parent | e445ee65cbefaa19131c972ae7fe221c95cf4cc4 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/sbuslib.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c index 646c43f921c5..3a74a63dd4f2 100644 --- a/drivers/video/sbuslib.c +++ b/drivers/video/sbuslib.c | |||
| @@ -46,6 +46,9 @@ int sbusfb_mmap_helper(struct sbus_mmap_map *map, | |||
| 46 | unsigned long off; | 46 | unsigned long off; |
| 47 | int i; | 47 | int i; |
| 48 | 48 | ||
| 49 | if (!(vma->vm_flags & (VM_SHARED | VM_MAYSHARE))) | ||
| 50 | return -EINVAL; | ||
| 51 | |||
| 49 | size = vma->vm_end - vma->vm_start; | 52 | size = vma->vm_end - vma->vm_start; |
| 50 | if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) | 53 | if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) |
| 51 | return -EINVAL; | 54 | return -EINVAL; |