binder: fix potential UAF of target_{proc,thread}
Carlos Llamas
maintainerPATCH 1/1 binder: fix potential UAF of target_{proc,thread}
Commit 9474be34a727 ("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'
--- drivers/android/binder.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/android/binder.c +5 -4
@@ -3546,10 +3546,6 @@ static void binder_transaction(struct binder_proc *proc, err_empty_call_stack: err_dead_binder: 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) {binder_dec_node (target_node,1 ,0 );binder_dec_node_tmpref (target_node);
@@ -3565,6 +3561,11 @@ static void binder_transaction(struct binder_proc *proc, (u64 )tr->data_size, (u64 )tr->offsets_size, 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;
Signature · 1 line
2.36.0.550.gb090851708-goog
Quoted 8 lines · Carlos Llamas
Commit
9474be34a727("binder: add failed transaction logging info") dereferences target_{proc,thread} after they have been potentially freed bybinder_proc_dec_tmpref()andbinder_thread_dec_tmpref().This patch delays the release of the two references after their last usage. Fixes the following two errors reported by smatch:
Quoted 6 lines
drivers/android/binder.c:3562binder_transaction()error: dereferencing freed memory 'target_proc'drivers/android/binder.c:3563binder_transaction()error: dereferencing freed memory 'target_thread'Fixes 9474be34a727 ("binder: add failed transaction logging info")Reported-by Dan Carpenter <[email protected]>Signed-off-by Carlos Llamas <[email protected]>
Quoted 34 lines
--- drivers/android/binder.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/android/binder.c +5
-5@@ -3546,10 +3546,6 @@ static void binder_transaction(struct binder_proc *proc, err_empty_call_stack: err_dead_binder: 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) {binder_dec_node (target_node,1 ,0 );binder_dec_node_tmpref (target_node);@@ -3565,6 +3561,11 @@ static void binder_transaction(struct binder_proc *proc, (u64 )tr->data_size, (u64 )tr->offsets_size, 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; --2.36.0.550.gb090851708-goog