Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usercopy: use unsigned long instead of uintptr_t

A recent commit factored out a series of annoying (unsigned long) casts
into a single variable declaration, but made the pointer type a
`uintptr_t` rather than the usual `unsigned long`. This patch changes it
to be the integer type more typically used by the kernel to represent
addresses.

Fixes: 35fb9ae4aa2e ("usercopy: Cast pointer to an integer once")
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Uladzislau Rezki <urezki@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220616143617.449094-1-Jason@zx2c4.com

authored by

Jason A. Donenfeld and committed by
Kees Cook
170b2c35 a111daf0

+1 -1
+1 -1
mm/usercopy.c
··· 161 161 static inline void check_heap_object(const void *ptr, unsigned long n, 162 162 bool to_user) 163 163 { 164 - uintptr_t addr = (uintptr_t)ptr; 164 + unsigned long addr = (unsigned long)ptr; 165 165 unsigned long offset; 166 166 struct folio *folio; 167 167