@@ -595,14 +595,14 @@ static int do_procmap_query(struct proc_maps_private *priv, void __user *uarg)
query_vma_teardown(mm, vma);
mmput(mm);
- if (karg.vma_name_size && copy_to_user((void __user *)karg.vma_name_addr,
+ if (karg.vma_name_size && copy_to_user(u64_to_user_ptr(karg.vma_name_addr),
name, karg.vma_name_size)) {
kfree(name_buf);
return -EFAULT;
}
kfree(name_buf);
- if (karg.build_id_size && copy_to_user((void __user *)karg.build_id_addr,
+ if (karg.build_id_size && copy_to_user(u64_to_user_ptr(karg.build_id_addr),
build_id_buf, karg.build_id_size))
return -EFAULT;
On 32-bit architectures compiler will complain about casting __u64 to void * pointer: fs/proc/task_mmu.c: In function 'do_procmap_query': fs/proc/task_mmu.c:598:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 598 | if (karg.vma_name_size && copy_to_user((void __user *)karg.vma_name_addr, | ^ fs/proc/task_mmu.c:605:48: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 605 | if (karg.build_id_size && copy_to_user((void __user *)karg.build_id_addr, | ^ Fix this by using u64_to_user_ptr() helper that's meant to handle this properly. Suggested-by: Arnd Bergmann <arnd@arndb.de> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Fixes: df789ce1eb90 ("fs/procfs: add build ID fetching to PROCMAP_QUERY API") Fixes: 3757be498749 ("fs/procfs: implement efficient VMA querying API for /proc/<pid>/maps") Signed-off-by: Andrii Nakryiko <andrii@kernel.org> --- fs/proc/task_mmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)