Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

10bb10dc · Linus Torvalds · 3bf39599 · e445ee65 · 10bb10dc
Commit 10bb10dc authored Dec 24, 2005 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

drivers/video/sbuslib.c drivers/video/sbuslib.c +3 -0

No files found.
--- a/drivers/video/sbuslib.c
+++ b/drivers/video/sbuslib.c
@@ -46,6 +46,9 @@ int sbusfb_mmap_helper(struct sbus_mmap_map *map,
 	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;