binder: fix memory leak in error path
Todd Kjos
maintainerPATCH 1/1 binder: fix memory leak in error path
syzkallar found a 32-byte memory leak in a rarely executed error case. The transaction complete work item was not freed if put_user() failed when writing the BR_TRANSACTION_COMPLETE to the user command buffer. Fixed by freeing it before put_user() is called.
Reported-by [email protected]
Signed-off-by Todd Kjos <[email protected]>
--- drivers/android/binder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/android/binder.c +2 -2
@@ -4268,6 +4268,8 @@ static int binder_thread_read(struct binder_proc *proc,case BINDER_WORK_TRANSACTION_COMPLETE : {binder_inner_proc_unlock (proc); cmd =BR_TRANSACTION_COMPLETE ; +kfree (w); +binder_stats_deleted (BINDER_STAT_TRANSACTION_COMPLETE );if (put_user (cmd, (uint32_t __user *)ptr))return -EFAULT ; ptr +=sizeof (uint32_t );
@@ -4276,8 +4278,6 @@ static int binder_thread_read(struct binder_proc *proc,binder_debug (BINDER_DEBUG_TRANSACTION_COMPLETE ,"%d:%d BR_TRANSACTION_COMPLETE\n" , proc->pid, thread->pid); -kfree (w); -binder_stats_deleted (BINDER_STAT_TRANSACTION_COMPLETE ); }break ;case BINDER_WORK_NODE : { struct binder_node *node = container_of(w, struct binder_node, work);
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog