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

Commit f540ce02 authored by Todd Kjos's avatar Todd Kjos Committed by Martijn Coenen
Browse files

UPSTREAM: binder: replace "%p" with "%pK" 



The format specifier "%p" can leak kernel addresses. Use
"%pK" instead. There were 4 remaining cases in binder.c.

Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 8ca86f1639ec5890d400fff9211aca22d0a392eb)

Change-Id: I309241853c53bcdfa65c17cb05876e786597afdd
parent 558ee936

drivers/android/binder.c

+4 −4
Original line number Diff line number Diff line
@@ -2350,7 +2350,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc, 
	int debug_id = buffer->debug_id;



	binder_debug(BINDER_DEBUG_TRANSACTION,

		     "%d buffer release %d, size %zd-%zd, failed at %p\n",

		     "%d buffer release %d, size %zd-%zd, failed at %pK\n",

		     proc->pid, buffer->debug_id,

		     buffer->data_size, buffer->offsets_size, failed_at);
@@ -3886,7 +3886,7 @@ static int binder_thread_write(struct binder_proc *proc, 
				}

			}

			binder_debug(BINDER_DEBUG_DEAD_BINDER,

				     "%d:%d BC_DEAD_BINDER_DONE %016llx found %p\n",

				     "%d:%d BC_DEAD_BINDER_DONE %016llx found %pK\n",

				     proc->pid, thread->pid, (u64)cookie,

				     death);

			if (death == NULL) {
@@ -5236,7 +5236,7 @@ static void print_binder_transaction_ilocked(struct seq_file *m, 
	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 %d:%d r%d",

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

		   prefix, t->debug_id, t,

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

		   t->from ? t->from->pid : 0,
@@ -5261,7 +5261,7 @@ static void print_binder_transaction_ilocked(struct seq_file *m, 
	}

	if (buffer->target_node)

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

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

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

		   buffer->data_size, buffer->offsets_size,

		   buffer->data);

}