提交 5a06fcb1 编写于 作者: A Arnd Bergmann

lib/test_lockup: fix kernel pointer check for separate address spaces

test_kernel_ptr() uses access_ok() to figure out if a given address
points to user space instead of kernel space. However on architectures
that set CONFIG_ALTERNATE_USER_ADDRESS_SPACE, a pointer can be valid
for both, and the check always fails because access_ok() returns true.

Make the check for user space pointers conditional on the type of
address space layout.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>
上级 12700c17
......@@ -417,9 +417,14 @@ static bool test_kernel_ptr(unsigned long addr, int size)
return false;
/* should be at least readable kernel address */
if (access_ok((void __user *)ptr, 1) ||
access_ok((void __user *)ptr + size - 1, 1) ||
get_kernel_nofault(buf, ptr) ||
if (!IS_ENABLED(CONFIG_ALTERNATE_USER_ADDRESS_SPACE) &&
(access_ok((void __user *)ptr, 1) ||
access_ok((void __user *)ptr + size - 1, 1))) {
pr_err("user space ptr invalid in kernel: %#lx\n", addr);
return true;
}
if (get_kernel_nofault(buf, ptr) ||
get_kernel_nofault(buf, ptr + size - 1)) {
pr_err("invalid kernel ptr: %#lx\n", addr);
return true;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册