This is a note to let you know that I've just added the patch titled
binder: fix pointer cast warning
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
binder-fix-pointer-cast-warning.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Wed Nov 30 01:41:25 PM CET 2022
From: Carlos Llamas <cmllamas@xxxxxxxxxx>
Date: Wed, 30 Nov 2022 03:58:03 +0000
Subject: binder: fix pointer cast warning
To: stable@xxxxxxxxxx, "Greg Kroah-Hartman" <gregkh@xxxxxxxxxxxxxxxxxxx>, "Arve Hjønnevåg" <arve@xxxxxxxxxxx>, "Todd Kjos" <tkjos@xxxxxxxxxxx>, "Martijn Coenen" <maco@xxxxxxxxxxx>, "Joel Fernandes" <joel@xxxxxxxxxxxxxxxxx>, "Christian Brauner" <christian@xxxxxxxxxx>, "Hridya Valsaraju" <hridya@xxxxxxxxxx>, "Suren Baghdasaryan" <surenb@xxxxxxxxxx>
Cc: linux-kernel@xxxxxxxxxxxxxxx, kernel-team@xxxxxxxxxxx, Arnd Bergmann <arnd@xxxxxxxx>, Todd Kjos <tkjos@xxxxxxxxxx>, Randy Dunlap <rdunlap@xxxxxxxxxxxxx>, Christian Brauner <christian.brauner@xxxxxxxxxx>, Carlos Llamas <cmllamas@xxxxxxxxxx>
Message-ID: <20221130035805.1823970-5-cmllamas@xxxxxxxxxx>
From: Arnd Bergmann <arnd@xxxxxxxx>
commit 9a0a930fe2535a76ad70d3f43caeccf0d86a3009 upstream.
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: 656e01f3ab54 ("binder: read pre-translated fds from sender buffer")
Acked-by: Todd Kjos <tkjos@xxxxxxxxxx>
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> # build-tested
Acked-by: Christian Brauner <christian.brauner@xxxxxxxxxx>
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Link: https://lore.kernel.org/r/20211207122448.1185769-1-arnd@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Carlos Llamas <cmllamas@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/android/binder.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2908,7 +2908,8 @@ static int binder_translate_fd_array(str
*/
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))) {
Patches currently in stable-queue which might be from cmllamas@xxxxxxxxxx are
queue-5.10/binder-address-corner-cases-in-deferred-copy-and-fixup.patch
queue-5.10/binder-gracefully-handle-binder_type_fda-objects-with-num_fds-0.patch
queue-5.10/binder-read-pre-translated-fds-from-sender-buffer.patch
queue-5.10/binder-avoid-potential-data-leakage-when-copying-txn.patch
queue-5.10/binder-fix-pointer-cast-warning.patch
queue-5.10/binder-defer-copies-of-pre-patched-txn-data.patch
