lkml.org 
[lkml]   [2016]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 037/142] drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE
    Date
    3.16.7-ckt26 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Lisa Du <cldu@marvell.com>

    commit 7a64cd887fdb97f074c3fda03bee0bfb9faceac3 upstream.

    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.")
    Acked-by: Olof Johansson <olof@lixom.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [ luis: backported to 3.16:
    - binder is still in staging in the 3.16 kernel]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/staging/android/binder.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
    index a741da77828a..3b79624703a7 100644
    --- a/drivers/staging/android/binder.c
    +++ b/drivers/staging/android/binder.c
    @@ -2049,7 +2049,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);

    \
     
     \ /
      Last update: 2016-03-22 13:01    [W:3.897 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site