Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 517e1fbe authored by Laura Abbott's avatar Laura Abbott Committed by Kees Cook
Browse files

mm/usercopy: Drop extra is_vmalloc_or_module() check 



Previously virt_addr_valid() was insufficient to validate if virt_to_page()
could be called on an address on arm64. This has since been fixed up so
there is no need for the extra check. Drop it.

Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 96dc4f9f

mm/usercopy.c

+0 −11
Original line number Diff line number Diff line
@@ -200,17 +200,6 @@ static inline const char *check_heap_object(const void *ptr, unsigned long n, 
{

	struct page *page;



	/*

	 * Some architectures (arm64) return true for virt_addr_valid() on

	 * vmalloced addresses. Work around this by checking for vmalloc

	 * first.

	 *

	 * We also need to check for module addresses explicitly since we

	 * may copy static data from modules to userspace

	 */

	if (is_vmalloc_or_module_addr(ptr))

		return NULL;



	if (!virt_addr_valid(ptr))

		return NULL;