Commit 86578a0f authored May 22, 2017 by Xu YiPing Committed by Todd Kjos Sep 05, 2017

FROMLIST: binder: fix memory corruption in binder_transaction binder

(from https://patchwork.kernel.org/patch/9939405/

)

commit 7a4408c6bd3e ("binder: make sure accesses to proc/thread are
safe") made a change to enqueue tcomplete to thread->todo before
enqueuing the transaction. However, in err_dead_proc_or_thread case,
the tcomplete is directly freed, without dequeued. It may cause the
thread->todo list to be corrupted.

So, dequeue it before freeing.

Bug: 65333488
Change-Id: Id063a4db18deaa634f4d44aa6ebca47bea32537a
Signed-off-by: Xu YiPing <xuyiping@hisilicon.com>
Signed-off-by: Todd Kjos <tkjos@google.com>

parent 6cd21278

drivers/android/binder.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3252,6 +3252,7 @@ static void binder_transaction(struct binder_proc *proc,
		err_dead_proc_or_thread:
		return_error = BR_DEAD_REPLY;
		return_error_line = __LINE__;
		binder_dequeue_work(proc, tcomplete);
		err_translate_failed:
		err_bad_object_type:
		err_bad_offset: