Skip to content
/ linux Public

Commit 17de6ad

Browse files
t-8chSasha Levin
authored andcommitted
binder: don't use %pK through printk
[ Upstream commit 56d2126 ] In the past %pK was preferable to %p as it would not leak raw pointer values into the kernel log. Since commit ad67b74 ("printk: hash addresses printed with %p") the regular %p has been improved to avoid this issue. Furthermore, restricted pointers ("%pK") were never meant to be used through printk(). They can still unintentionally leak raw pointers or acquire sleeping locks in atomic contexts. Switch to the regular pointer formatting which is safer and easier to reason about. There are still a few users of %pK left, but these use it through seq_file, for which its usage is safe. Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de> Acked-by: Carlos Llamas <cmllamas@google.com> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Link: https://patch.msgid.link/20260107-restricted-pointers-binder-v1-1-181018bf3812@linutronix.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 5b3350e commit 17de6ad

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/android/binder.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4523,7 +4523,7 @@ static int binder_thread_write(struct binder_proc *proc,
45234523
}
45244524
}
45254525
binder_debug(BINDER_DEBUG_DEAD_BINDER,
4526-
"%d:%d BC_DEAD_BINDER_DONE %016llx found %pK\n",
4526+
"%d:%d BC_DEAD_BINDER_DONE %016llx found %p\n",
45274527
proc->pid, thread->pid, (u64)cookie,
45284528
death);
45294529
if (death == NULL) {

drivers/android/binder_alloc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static void binder_insert_free_buffer(struct binder_alloc *alloc,
8181
new_buffer_size = binder_alloc_buffer_size(alloc, new_buffer);
8282

8383
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
84-
"%d: add free buffer, size %zd, at %pK\n",
84+
"%d: add free buffer, size %zd, at %p\n",
8585
alloc->pid, new_buffer_size, new_buffer);
8686

8787
while (*p) {
@@ -572,7 +572,7 @@ static struct binder_buffer *binder_alloc_new_buf_locked(
572572
}
573573

574574
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
575-
"%d: binder_alloc_buf size %zd got buffer %pK size %zd\n",
575+
"%d: binder_alloc_buf size %zd got buffer %p size %zd\n",
576576
alloc->pid, size, buffer, buffer_size);
577577

578578
/*
@@ -748,7 +748,7 @@ static void binder_free_buf_locked(struct binder_alloc *alloc,
748748
ALIGN(buffer->extra_buffers_size, sizeof(void *));
749749

750750
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
751-
"%d: binder_free_buf %pK size %zd buffer_size %zd\n",
751+
"%d: binder_free_buf %p size %zd buffer_size %zd\n",
752752
alloc->pid, buffer, size, buffer_size);
753753

754754
BUG_ON(buffer->free);

0 commit comments

Comments
 (0)