Commit 9a0a930f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

binder: fix pointer cast warning 



binder_uintptr_t is not the same as uintptr_t, so converting it into a
pointer requires a second cast:

drivers/android/binder.c: In function 'binder_translate_fd_array':
drivers/android/binder.c:2511:28: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
 2511 |         sender_ufda_base = (void __user *)sender_uparent->buffer + fda->parent_offset;
      |                            ^

Fixes: 656e01f3 ("binder: read pre-translated fds from sender buffer")
Acked-by: default avatarTodd Kjos <tkjos@google.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Acked-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20211207122448.1185769-1-arnd@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2925fc1c

drivers/android/binder.c

+2 −1
Original line number Diff line number Diff line
@@ -2508,7 +2508,8 @@ static int binder_translate_fd_array(struct list_head *pf_head, 
	 */

	fda_offset = (parent->buffer - (uintptr_t)t->buffer->user_data) +

		fda->parent_offset;

	sender_ufda_base = (void __user *)sender_uparent->buffer + fda->parent_offset;

	sender_ufda_base = (void __user *)(uintptr_t)sender_uparent->buffer +

				fda->parent_offset;



	if (!IS_ALIGNED((unsigned long)fda_offset, sizeof(u32)) ||

	    !IS_ALIGNED((unsigned long)sender_ufda_base, sizeof(u32))) {