[RESEND PATCH] drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE

[RESEND PATCH] drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE

[Nicolas Boichat]

From: Lisa Du <cldu@marvell.com>

There's one point was missed in the patch commit da49889deb34 ("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>
---

This patch was first sent upstream here: https://lkml.org/lkml/2015/5/28/747,
but was not picked up (probably because it was part of a bigger series that
refactored binder).

This patch fixes issues when using 64-bit binder API on 32-bit kernels.

 drivers/android/binder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 796301a..16288e7 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2081,7 +2081,7 @@ static int binder_thread_write(struct binder_proc *proc,
 			if (get_user(cookie, (binder_uintptr_t __user *)ptr))
 				return -EFAULT;
 
-			ptr += sizeof(void *);
+			ptr += sizeof(cookie);
 			list_for_each_entry(w, &proc->delivered_death, entry) {
 				struct binder_ref_death *tmp_death = container_of(w, struct binder_ref_death, work);
 
-- 
2.7.0.rc3.207.g0ac5344

Re: [RESEND PATCH] drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE

[Dan Carpenter]

On Wed, Feb 17, 2016 at 09:32:52AM +0800, Nicolas Boichat wrote:
> This patch was first sent upstream here: https://lkml.org/lkml/2015/5/28/747,
> but was not picked up (probably because it was part of a bigger series that
> refactored binder).

Riley was supposed to resend it with a proper sign off but he must have
lost track.  Anyway, thanks for doing follow up on this.

regards,
dan carpenter

Re: [RESEND PATCH] drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE

[Olof Johansson]

Hi,

On Tue, Feb 16, 2016 at 5:32 PM, Nicolas Boichat <drinkcat@chromium.org> wrote:
> From: Lisa Du <cldu@marvell.com>
>
> There's one point was missed in the patch commit da49889deb34 ("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: da49889deb34 ("staging: binder: Support concurrent 32 bit and
64 bit processes.")
Cc: <stable@vger.kernel.org>
Acked-by: Olof Johansson <olof@lixom.net>

(Hopefully Greg's script adds all 3 tags when he applies the patch. :)


-Olof

Re: [RESEND PATCH] drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE

[Greg Kroah-Hartman]

On Fri, Feb 19, 2016 at 07:08:40AM -0800, Olof Johansson wrote:
> Hi,
> 
> On Tue, Feb 16, 2016 at 5:32 PM, Nicolas Boichat <drinkcat@chromium.org> wrote:
> > From: Lisa Du <cldu@marvell.com>
> >
> > There's one point was missed in the patch commit da49889deb34 ("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: da49889deb34 ("staging: binder: Support concurrent 32 bit and
> 64 bit processes.")
> Cc: <stable@vger.kernel.org>
> Acked-by: Olof Johansson <olof@lixom.net>
> 
> (Hopefully Greg's script adds all 3 tags when he applies the patch. :)

Now added, thanks.

greg k-h