diff options
| author | Laura Abbott | 2017-04-04 23:09:00 +0200 |
|---|---|---|
| committer | Kees Cook | 2017-04-05 21:30:18 +0200 |
| commit | 517e1fbeb65f5eade8d14f46ac365db6c75aea9b (patch) | |
| tree | e11991a0fd19229b26d945d72415938609238b99 /mm/usercopy.c | |
| parent | usercopy: Move enum for arch_within_stack_frames() (diff) | |
| download | kernel-qcow2-linux-517e1fbeb65f5eade8d14f46ac365db6c75aea9b.tar.gz kernel-qcow2-linux-517e1fbeb65f5eade8d14f46ac365db6c75aea9b.tar.xz kernel-qcow2-linux-517e1fbeb65f5eade8d14f46ac365db6c75aea9b.zip | |
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: Laura Abbott <labbott@redhat.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'mm/usercopy.c')
| -rw-r--r-- | mm/usercopy.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/mm/usercopy.c b/mm/usercopy.c index 1eba99baf1cf..a9852b24715d 100644 --- a/mm/usercopy.c +++ b/mm/usercopy.c @@ -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; |