Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
This commit is contained in:
commit
10bb10dcb6
@ -46,6 +46,9 @@ int sbusfb_mmap_helper(struct sbus_mmap_map *map,
|
|||||||
unsigned long off;
|
unsigned long off;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
if (!(vma->vm_flags & (VM_SHARED | VM_MAYSHARE)))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
size = vma->vm_end - vma->vm_start;
|
size = vma->vm_end - vma->vm_start;
|
||||||
if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
|
if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
Loading…
Reference in New Issue
Block a user