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

Commit da957e45 authored by Todd Kjos's avatar Todd Kjos
Browse files

FROMLIST: binder: protect against stale pointers in print_binder_transaction 

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

)

When printing transactions there were several race conditions
that could cause a stale pointer to be deferenced. Fixed by
reading the pointer once and using it if valid (which is
safe). The transaction buffer also needed protection via proc
lock, so it is only printed if we are holding the correct lock.

Bug: 36650912
Test: tested manually
Change-Id: I78240f99cc1a070d70a841c0d84d4306e2fd528d
Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
parent 6fcb2b9a

drivers/android/binder.c

+40 −20
Original line number Diff line number Diff line
@@ -4703,33 +4703,50 @@ binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer) 
	mutex_unlock(&binder_deferred_lock);

}



static void print_binder_transaction(struct seq_file *m, const char *prefix,

static void print_binder_transaction_ilocked(struct seq_file *m,

					     struct binder_proc *proc,

					     const char *prefix,

					     struct binder_transaction *t)

{

	struct binder_proc *to_proc;

	struct binder_buffer *buffer = t->buffer;



	WARN_ON(!spin_is_locked(&proc->inner_lock));

	spin_lock(&t->lock);

	to_proc = t->to_proc;

	seq_printf(m,

		   "%s %d: %p from %d:%d to %d:%d code %x flags %x pri %ld r%d",

		   prefix, t->debug_id, t,

		   t->from ? t->from->proc->pid : 0,

		   t->from ? t->from->pid : 0,

		   t->to_proc ? t->to_proc->pid : 0,

		   to_proc ? to_proc->pid : 0,

		   t->to_thread ? t->to_thread->pid : 0,

		   t->code, t->flags, t->priority, t->need_reply);

	spin_unlock(&t->lock);



	if (t->buffer == NULL) {

	if (proc != to_proc) {

		/*

		 * Can only safely deref buffer if we are holding the

		 * correct proc inner lock for this node

		 */

		seq_puts(m, "\n");

		return;

	}



	if (buffer == NULL) {

		seq_puts(m, " buffer free\n");

		return;

	}

	if (t->buffer->target_node)

		seq_printf(m, " node %d",

			   t->buffer->target_node->debug_id);

	if (buffer->target_node)

		seq_printf(m, " node %d", buffer->target_node->debug_id);

	seq_printf(m, " size %zd:%zd data %p\n",

		   t->buffer->data_size, t->buffer->offsets_size,

		   t->buffer->data);

		   buffer->data_size, buffer->offsets_size,

		   buffer->data);

}



static void print_binder_work_ilocked(struct seq_file *m, const char *prefix,

static void print_binder_work_ilocked(struct seq_file *m,

				     struct binder_proc *proc,

				     const char *prefix,

				     const char *transaction_prefix,

				     struct binder_work *w)

{
@@ -4739,7 +4756,8 @@ static void print_binder_work_ilocked(struct seq_file *m, const char *prefix, 
	switch (w->type) {

	case BINDER_WORK_TRANSACTION:

		t = container_of(w, struct binder_transaction, work);

		print_binder_transaction(m, transaction_prefix, t);

		print_binder_transaction_ilocked(

				m, proc, transaction_prefix, t);

		break;

	case BINDER_WORK_RETURN_ERROR: {

		struct binder_error *e = container_of(
@@ -4790,20 +4808,21 @@ static void print_binder_thread_ilocked(struct seq_file *m, 
	t = thread->transaction_stack;

	while (t) {

		if (t->from == thread) {

			print_binder_transaction(m,

			print_binder_transaction_ilocked(m, thread->proc,

					"    outgoing transaction", t);

			t = t->from_parent;

		} else if (t->to_thread == thread) {

			print_binder_transaction(m,

			print_binder_transaction_ilocked(m, thread->proc,

						 "    incoming transaction", t);

			t = t->to_parent;

		} else {

			print_binder_transaction(m, "    bad transaction", t);

			print_binder_transaction_ilocked(m, thread->proc,

					"    bad transaction", t);

			t = NULL;

		}

	}

	list_for_each_entry(w, &thread->todo, entry) {

		print_binder_work_ilocked(m, "    ",

		print_binder_work_ilocked(m, thread->proc, "    ",

					  "    pending transaction", w);

	}

	if (!print_always && m->count == header_pos)
@@ -4838,7 +4857,7 @@ static void print_binder_node_nilocked(struct seq_file *m, 
	seq_puts(m, "\n");

	if (node->proc) {

		list_for_each_entry(w, &node->async_todo, entry)

			print_binder_work_ilocked(m, "    ",

			print_binder_work_ilocked(m, node->proc, "    ",

					  "    pending async transaction", w);

	}

}
@@ -4910,7 +4929,8 @@ static void print_binder_proc(struct seq_file *m, 
	binder_alloc_print_allocated(m, &proc->alloc);

	binder_inner_proc_lock(proc);

	list_for_each_entry(w, &proc->todo, entry)

		print_binder_work_ilocked(m, "  ", "  pending transaction", w);

		print_binder_work_ilocked(m, proc, "  ",

					  "  pending transaction", w);

	list_for_each_entry(w, &proc->delivered_death, entry) {

		seq_puts(m, "  has delivered dead binder\n");

		break;