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

xiaoqiangnk · Dec 24, 2005 · 10bb10d · 10bb10d
2 parents 3bf3959 + e445ee6
commit 10bb10d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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;