git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/hda' into for-linus
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
sys_sh.c
diff --git
a/arch/sh/kernel/sys_sh.c
b/arch/sh/kernel/sys_sh.c
index
58dfc02
..
e3a7e36
100644
(file)
--- a/
arch/sh/kernel/sys_sh.c
+++ b/
arch/sh/kernel/sys_sh.c
@@
-63,6
+63,15
@@
asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
unsigned long prot, unsigned long flags,
unsigned long fd, unsigned long pgoff)
{
unsigned long prot, unsigned long flags,
unsigned long fd, unsigned long pgoff)
{
+ /*
+ * The shift for mmap2 is constant, regardless of PAGE_SIZE
+ * setting.
+ */
+ if (pgoff & ((1 << (PAGE_SHIFT - 12)) - 1))
+ return -EINVAL;
+
+ pgoff >>= PAGE_SHIFT - 12;
+
return do_mmap2(addr, len, prot, flags, fd, pgoff);
}
return do_mmap2(addr, len, prot, flags, fd, pgoff);
}