[PATCH] MIPS: fix access_ok()
From: Yong Zhang <hidden>
Date: 2013-02-20 06:17:53
Also in:
lkml
Subsystem:
mips, the rest · Maintainers:
Thomas Bogendoerfer, Linus Torvalds
From: Yong Zhang <redacted>
Current access_ok() will fail even if the address range is
valid when it reaches to the end of TASK_SIZE.
For exampe: addr = 0xfffffffff0; size = 16;
the real address range it want to access is 0xfffffffff0~0xfffffffff;
but addr + size = 0x10000000000 which we will not and can't access.
In current realization of access_ok(), the high bit will be 1
thus access_ok() indicates the operation is not allowed.
The bug is found in old kerenl(before vdso is realized) in
following typical call trace:
sys_mount()
copy_mount_options()
exact_copy_from_user()
When the parameter 'from' for exact_copy_from_user() residents in
the last page of the task's virtual address, such as stack.
But it's still in current kernel.
Signed-off-by: Yong Zhang <redacted>
Cc: Ralf Baechle <redacted>
Cc: David Daney <redacted>
---
arch/mips/include/asm/uaccess.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
index 3b92efe..55d4214 100644
--- a/arch/mips/include/asm/uaccess.h
+++ b/arch/mips/include/asm/uaccess.h@@ -114,8 +114,12 @@ extern u64 __ua_limit; unsigned long __ok; \ \ __chk_user_ptr(addr); \ - __ok = (signed long)(__mask & (__addr | (__addr + __size) | \ - __ua_size(__size))); \ + if (likely(size)) \ + __ok = (signed long)(__mask & (__addr | \ + (__addr + __size - 1) | \ + __ua_size(__size))); \ + else \ + __ok = 0; \ __ok == 0; \ })
--
1.7.9.5