usercopy: no check page span for stack objects
PATCH 1/1 usercopy: no check page span for stack objects
It is easy to trigger this with CONFIG_HARDENED_USERCOPY_PAGESPAN=y,
usercopy: Kernel memory overwrite attempt detected to spans multiple pages (offset 0, size 23)!
kernel BUG at mm/usercopy.c:102!
For example,
print_worker_info
char name[WQ_NAME_LEN] = { };
char desc[WORKER_DESC_LEN] = { };
probe_kernel_read(name, wq->name, sizeof(name) - 1); probe_kernel_read(desc, worker->desc, sizeof(desc) - 1);
__copy_from_user_inatomic
check_object_size
check_heap_object
check_page_span
This is because on-stack variables could cross PAGE_SIZE boundary, and failed this check,
if (likely(((unsigned long)ptr & (unsigned long)PAGE_MASK) ==
((unsigned long)end & (unsigned long)PAGE_MASK)))
ptr = FFFF889007D7EFF8
end = FFFF889007D7F00E
Hence, fix it by checking if it is a stack object first.
--- mm/usercopy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/usercopy.c +3 -3
@@ -262,9 +262,6 @@ void __check_object_size(const void *ptr, unsigned long n, bool to_user)/* Check for invalid addresses. */ check_bogus_address ((const unsigned long )ptr, n, to_user); -/* Check for bad heap object. */ -check_heap_object (ptr, n, to_user); -/* Check for bad stack object. */ switch (check_stack_object (ptr, n)) {case NOT_STACK :
@@ -282,6 +279,9 @@ void __check_object_size(const void *ptr, unsigned long n, bool to_user)usercopy_abort ("process stack" ,NULL , to_user,0 , n); } +/* Check for bad heap object. */ +check_heap_object (ptr, n, to_user); +/* Check for object in kernel to avoid text exposure. */ check_kernel_text_object ((const unsigned long )ptr, n, to_user); }
Signature · 1 line
2.17.2 (Apple Git-113)