浏览代码

[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>

---

H. Peter Anvin 19 年之前
父节点
当前提交
947df17cb1
共有 2 个文件被更改,包括 8 次插入1 次删除
  1. 4 0
      arch/mips/kernel/linux32.c
  2. 4 1
      arch/mips/kernel/syscall.c

+ 4 - 0
arch/mips/kernel/linux32.c

@@ -106,6 +106,10 @@ sys32_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
 	unsigned long error;
 	unsigned long error;
 
 
 	error = -EINVAL;
 	error = -EINVAL;
+	if (pgoff & (~PAGE_MASK >> 12))
+		goto out;
+	pgoff >>= PAGE_SHIFT-12;
+
 	if (!(flags & MAP_ANONYMOUS)) {
 	if (!(flags & MAP_ANONYMOUS)) {
 		error = -EBADF;
 		error = -EBADF;
 		file = fget(fd);
 		file = fget(fd);

+ 4 - 1
arch/mips/kernel/syscall.c

@@ -162,7 +162,10 @@ asmlinkage unsigned long
 sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
 sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
           unsigned long flags, unsigned long fd, unsigned long pgoff)
           unsigned long flags, unsigned long fd, unsigned long pgoff)
 {
 {
-	return do_mmap2(addr, len, prot, flags, fd, pgoff);
+	if (pgoff & (~PAGE_MASK >> 12))
+		return -EINVAL;
+
+	return do_mmap2(addr, len, prot, flags, fd, pgoff >> (PAGE_SHIFT-12));
 }
 }
 
 
 save_static_function(sys_fork);
 save_static_function(sys_fork);