luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 5a06fcb15b43d1f7bf740c672950122331cb5655 ]

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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Arnd Bergmann 2022-02-16 13:48:06 +01:00 committed by Greg Kroah-Hartman
parent 40a5c93a74
commit 08ec8450f3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/test_lockup.c
View File

@ -417,9 +417,14 @@ static bool test_kernel_ptr(unsigned long addr, int size)
return false; return false;
/* should be at least readable kernel address */ /* should be at least readable kernel address */
if (access_ok((void __user *)ptr, 1) || if (!IS_ENABLED(CONFIG_ALTERNATE_USER_ADDRESS_SPACE) &&
access_ok((void __user *)ptr + size - 1, 1) || (access_ok((void __user *)ptr, 1) ||
get_kernel_nofault(buf, ptr) || 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)) { get_kernel_nofault(buf, ptr + size - 1)) {
pr_err("invalid kernel ptr: %#lx\n", addr); pr_err("invalid kernel ptr: %#lx\n", addr);
return true; return true;