diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-03 16:01:03 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-06-03 16:01:05 +1000 |
| commit | ed5fbe18ee8193171f0c8939e005e80b44f6484e (patch) | |
| tree | a770740b4aafcc95133e6d9dfc2ca03cc282ceb3 /fs/ncpfs/mmap.c | |
| parent | 3ce38be3820576a3ab11c16898c9dd47a6c4c8ba (diff) | |
| parent | fb853310b552f73313f99e3883eb56ef2e66348d (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/ncpfs/mmap.c')
| -rw-r--r-- | fs/ncpfs/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c index ee24df5af1f9..3c5dd55d284c 100644 --- a/fs/ncpfs/mmap.c +++ b/fs/ncpfs/mmap.c @@ -117,7 +117,7 @@ int ncp_mmap(struct file *file, struct vm_area_struct *vma) return -EINVAL; /* we do not support files bigger than 4GB... We eventually supports just 4GB... */ - if (((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff + if (vma_pages(vma) + vma->vm_pgoff > (1U << (32 - PAGE_SHIFT))) return -EFBIG; |