Skip to content

Commit

Permalink
lib/test_lockup: fix kernel pointer check for separate address spaces
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
arndb committed Feb 25, 2022
1 parent 12700c1 commit 5a06fcb
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions lib/test_lockup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5a06fcb

Please sign in to comment.