Skip to content

Commit 7a64cd8

Browse files
Lisa Dugregkh
Lisa Du
authored and
gregkh
committed
drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE
There's one point was missed in the patch commit da49889 ("staging: binder: Support concurrent 32 bit and 64 bit processes."). When configure BINDER_IPC_32BIT, the size of binder_uintptr_t was 32bits, but size of void * is 64bit on 64bit system. Correct it here. Signed-off-by: Lisa Du <cldu@marvell.com> Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> Fixes: da49889 ("staging: binder: Support concurrent 32 bit and 64 bit processes.") Cc: <stable@vger.kernel.org> Acked-by: Olof Johansson <olof@lixom.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 388f7b1 commit 7a64cd8

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎drivers/android/binder.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,7 @@ static int binder_thread_write(struct binder_proc *proc,
20742074
if (get_user(cookie, (binder_uintptr_t __user *)ptr))
20752075
return -EFAULT;
20762076

2077-
ptr += sizeof(void *);
2077+
ptr += sizeof(cookie);
20782078
list_for_each_entry(w, &proc->delivered_death, entry) {
20792079
struct binder_ref_death *tmp_death = container_of(w, struct binder_ref_death, work);
20802080

0 commit comments

Comments
 (0)