diff options
| author | Linus Torvalds | 2016-02-28 16:39:15 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2016-02-28 16:39:15 +0100 |
| commit | 8da51430ff28d2f2daa570f060b1c9fbba81c81a (patch) | |
| tree | 9b554e64b51fd2ae3289b44af4d05276cb862eea | |
| parent | Merge tag 'usb-4.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| parent | drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BIN... (diff) | |
| download | kernel-qcow2-linux-8da51430ff28d2f2daa570f060b1c9fbba81c81a.tar.gz kernel-qcow2-linux-8da51430ff28d2f2daa570f060b1c9fbba81c81a.tar.xz kernel-qcow2-linux-8da51430ff28d2f2daa570f060b1c9fbba81c81a.zip | |
Merge tag 'staging-4.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging/android fix from Greg KH:
"Here is one patch, for the android binder driver, to resolve a
reported problem. Turns out it has been around for a while (since
3.15), so it is good to finally get it resolved.
It has been in linux-next for a while with no reported issues"
* tag 'staging-4.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE
| -rw-r--r-- | drivers/android/binder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index a39e85f9efa9..7d00b7a015ea 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -2074,7 +2074,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); |