Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / drivers / video / sbuslib.c

diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c
index 646c43f921c55b3bc0774fecbd92cb38778b3b33..3a74a63dd4f228a4cb0691d24d796b65b25348d9 100644 (file)
--- 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;