| From: Andrii Nakryiko <andrii@kernel.org> |
| Subject: fs/procfs: fix integer to pointer cast warning in do_procmap_query() |
| Date: Mon, 1 Jul 2024 10:48:04 -0700 |
| |
| 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. |
| |
| Link: https://lkml.kernel.org/r/20240701174805.1897344-1-andrii@kernel.org |
| 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> |
| Suggested-by: Arnd Bergmann <arnd@arndb.de> |
| Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> |
| Cc: Alexey Dobriyan <adobriyan@gmail.com> |
| Cc: Al Viro <viro@zeniv.linux.org.uk> |
| Cc: Andi Kleen <ak@linux.intel.com> |
| Cc: Christian Brauner <brauner@kernel.org> |
| Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: Liam R. Howlett <Liam.Howlett@oracle.com> |
| Cc: Mike Rapoport (IBM) <rppt@kernel.org> |
| Cc: Suren Baghdasaryan <surenb@google.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| fs/proc/task_mmu.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/fs/proc/task_mmu.c~fs-procfs-add-build-id-fetching-to-procmap_query-api-fix |
| +++ a/fs/proc/task_mmu.c |
| @@ -595,14 +595,14 @@ static int do_procmap_query(struct proc_ |
| 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; |
| |
| _ |
