summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2022-06-12 22:32:26 +0100
committerKees Cook <keescook@chromium.org>2022-06-13 09:54:52 -0700
commit35fb9ae4aa2e838b234323e6f7cf6336ff019e5a (patch)
treea0dc23adacbc5ab211a2de1232e5be24a577ec70 /mm
parent993d0b287e2ef7bee2e8b13b0ce4d2b5066f278e (diff)
usercopy: Cast pointer to an integer once
Get rid of a lot of annoying casts by setting 'addr' once at the top of the function. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Uladzislau Rezki (Sony) <urezki@gmail.com> Tested-by: Zorro Lang <zlang@redhat.com> Signed-off-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20220612213227.3881769-3-willy@infradead.org
Diffstat (limited to 'mm')
-rw-r--r--mm/usercopy.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/mm/usercopy.c b/mm/usercopy.c
index cd4b41d9bf76..30a4db3cb1df 100644
--- a/mm/usercopy.c
+++ b/mm/usercopy.c
@@ -161,26 +161,27 @@ static inline void check_bogus_address(const unsigned long ptr, unsigned long n,
static inline void check_heap_object(const void *ptr, unsigned long n,
bool to_user)
{
+ uintptr_t addr = (uintptr_t)ptr;
struct folio *folio;
if (is_kmap_addr(ptr)) {
- unsigned long page_end = (unsigned long)ptr | (PAGE_SIZE - 1);
+ unsigned long page_end = addr | (PAGE_SIZE - 1);
- if ((unsigned long)ptr + n - 1 > page_end)
+ if (addr + n - 1 > page_end)
usercopy_abort("kmap", NULL, to_user,
offset_in_page(ptr), n);
return;
}
if (is_vmalloc_addr(ptr)) {
- struct vmap_area *area = find_vmap_area((unsigned long)ptr);
+ struct vmap_area *area = find_vmap_area(addr);
unsigned long offset;
if (!area)
usercopy_abort("vmalloc", "no area", to_user, 0, n);
- offset = (unsigned long)ptr - area->va_start;
- if ((unsigned long)ptr + n > area->va_end)
+ offset = addr - area->va_start;
+ if (addr + n > area->va_end)
usercopy_abort("vmalloc", NULL, to_user, offset, n);
return;
}