Commit a2b18708 authored Jul 05, 2017 by Todd Kjos Committed by Greg Kroah-Hartman Jul 17, 2017

Revert "android: binder: Sanity check at binder ioctl"



This reverts commit a906d693.

The patch introduced a race in the binder driver. An attempt to fix the
race was submitted in "[PATCH v2] android: binder: fix dangling pointer
comparison", however the conclusion in the discussion for that patch
was that the original patch should be reverted.

The reversion is being done as part of the fine-grained locking
patchset since the patch would need to be refactored when
proc->vmm_vm_mm is removed from struct binder_proc and added
in the binder allocator.

Signed-off-by: Todd Kjos <tkjos@google.com>
Cc: stable <stable@vger.kernel.org> # 4.6+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 5771a8c0

drivers/android/binder.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -3247,10 +3247,6 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
		/*pr_info("binder_ioctl: %d:%d %x %lx\n",
		proc->pid, current->pid, cmd, arg);*/

		if (unlikely(current->mm != proc->vma_vm_mm)) {
		pr_err("current mm mismatch proc mm\n");
		return -EINVAL;
		}
		trace_binder_ioctl(cmd, arg);

		ret = wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);
		@@ -3466,7 +3462,6 @@ static int binder_open(struct inode nodp, struct file filp)
		return -ENOMEM;
		get_task_struct(current);
		proc->tsk = current;
		proc->vma_vm_mm = current->mm;
		INIT_LIST_HEAD(&proc->todo);
		init_waitqueue_head(&proc->wait);
		proc->default_priority = task_nice(current);

Admin message