| commit | 10bb10dcb685cbe078e611f2dca3bd3e42fba0a8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Sat Dec 24 12:32:55 2005 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Sat Dec 24 12:32:55 2005 -0800 |
| tree | 79303391de7ed61a5c55b3599e386ee062e758ea | |
| parent | 3bf395994da5c238c37e281b50a5dd5f2532dc0c [diff] | |
| parent | e445ee65cbefaa19131c972ae7fe221c95cf4cc4 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c index 646c43f..3a74a63d 100644 --- a/drivers/video/sbuslib.c +++ b/drivers/video/sbuslib.c
@@ -46,6 +46,9 @@ unsigned long off; int i; + if (!(vma->vm_flags & (VM_SHARED | VM_MAYSHARE))) + return -EINVAL; + size = vma->vm_end - vma->vm_start; if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT)) return -EINVAL;