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 <>
Acked-by: default avatarMark Rutland <>
Signed-off-by: default avatarKees Cook <>
parent 96dc4f9f
...@@ -200,17 +200,6 @@ static inline const char *check_heap_object(const void *ptr, unsigned long n, ...@@ -200,17 +200,6 @@ static inline const char *check_heap_object(const void *ptr, unsigned long n,
{ {
struct page *page; 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)) if (!virt_addr_valid(ptr))
return NULL; return NULL;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment