Commit daf7b287 authored by Lisa Du's avatar Lisa Du Committed by Kamal Mostafa

drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE

commit 7a64cd88 upstream.

There's one point was missed in the patch commit da49889d ("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: default avatarLisa Du <cldu@marvell.com>
Signed-off-by: default avatarNicolas Boichat <drinkcat@chromium.org>
Fixes: da49889d ("staging: binder: Support concurrent 32 bit and 64 bit processes.")
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
[ luis: backported to 3.16:
  - binder is still in staging in the 3.16 kernel]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent a6d989cd
...@@ -2017,7 +2017,7 @@ static int binder_thread_write(struct binder_proc *proc, ...@@ -2017,7 +2017,7 @@ static int binder_thread_write(struct binder_proc *proc,
if (get_user(cookie, (void __user * __user *)ptr)) if (get_user(cookie, (void __user * __user *)ptr))
return -EFAULT; return -EFAULT;
ptr += sizeof(void *); ptr += sizeof(cookie);
list_for_each_entry(w, &proc->delivered_death, entry) { list_for_each_entry(w, &proc->delivered_death, entry) {
struct binder_ref_death *tmp_death = container_of(w, struct binder_ref_death, work); struct binder_ref_death *tmp_death = container_of(w, struct binder_ref_death, work);
if (tmp_death->cookie == cookie) { if (tmp_death->cookie == cookie) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment