summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/linux32.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2006-02-24 21:20:29 -0800
committerRalf Baechle <ralf@linux-mips.org>2006-03-21 13:27:48 +0000
commit947df17cb1be4c7239280a77263c249fde1379ef (patch)
tree1e32d0e81848e59a9796c3034208aa72432583d0 /arch/mips/kernel/linux32.c
parentde862b488e81172d4c610945efd9f3fc7f4b84a7 (diff)
downloadblackbird-op-linux-947df17cb1be4c7239280a77263c249fde1379ef.tar.gz
blackbird-op-linux-947df17cb1be4c7239280a77263c249fde1379ef.zip
[MIPS] sys_mmap2 offset argument should always be shifted 12, not PAGE_SHIFT.
This patch adjusts the offset argument passed into sys_mmap2 to be always shifted 12, even when the native page size isn't 4K. This is what all existing userspace libraries expect. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> ---
Diffstat (limited to 'arch/mips/kernel/linux32.c')
-rw-r--r--arch/mips/kernel/linux32.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 1e8d24823d39..013bc93688e8 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -106,6 +106,10 @@ sys32_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
unsigned long error;
error = -EINVAL;
+ if (pgoff & (~PAGE_MASK >> 12))
+ goto out;
+ pgoff >>= PAGE_SHIFT-12;
+
if (!(flags & MAP_ANONYMOUS)) {
error = -EBADF;
file = fget(fd);
OpenPOWER on IntegriCloud