Commit dafa5e9a authored by Carlos Llamas's avatar Carlos Llamas Committed by Greg Kroah-Hartman

binder: fix potential UAF of target_{proc,thread}

Commit 9474be34 ("binder: add failed transaction logging info")
dereferences target_{proc,thread} after they have been potentially
freed by binder_proc_dec_tmpref() and binder_thread_dec_tmpref().

This patch delays the release of the two references after their last
usage. Fixes the following two errors reported by smatch:

  drivers/android/binder.c:3562 binder_transaction() error: dereferencing freed memory 'target_proc'
  drivers/android/binder.c:3563 binder_transaction() error: dereferencing freed memory 'target_thread'

Fixes: 9474be34 ("binder: add failed transaction logging info")
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarTodd Kjos <tkjos@google.com>
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
Link: https://lore.kernel.org/r/20220517185817.598872-1-cmllamas@google.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da486496
...@@ -3546,10 +3546,6 @@ static void binder_transaction(struct binder_proc *proc, ...@@ -3546,10 +3546,6 @@ static void binder_transaction(struct binder_proc *proc,
err_empty_call_stack: err_empty_call_stack:
err_dead_binder: err_dead_binder:
err_invalid_target_handle: err_invalid_target_handle:
if (target_thread)
binder_thread_dec_tmpref(target_thread);
if (target_proc)
binder_proc_dec_tmpref(target_proc);
if (target_node) { if (target_node) {
binder_dec_node(target_node, 1, 0); binder_dec_node(target_node, 1, 0);
binder_dec_node_tmpref(target_node); binder_dec_node_tmpref(target_node);
...@@ -3565,6 +3561,11 @@ static void binder_transaction(struct binder_proc *proc, ...@@ -3565,6 +3561,11 @@ static void binder_transaction(struct binder_proc *proc,
(u64)tr->data_size, (u64)tr->offsets_size, (u64)tr->data_size, (u64)tr->offsets_size,
return_error_line); return_error_line);
if (target_thread)
binder_thread_dec_tmpref(target_thread);
if (target_proc)
binder_proc_dec_tmpref(target_proc);
{ {
struct binder_transaction_log_entry *fe; struct binder_transaction_log_entry *fe;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment