Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8da51430 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 62718e30 7a64cd88

drivers/android/binder.c

+1 −1
Original line number Diff line number Diff line
@@ -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);