binder: fix possible UAF when freeing buffer
Todd Kjos
maintainerPATCH 1/1 binder: fix possible UAF when freeing buffer
There is a race between the binder driver cleaning up a completed transaction via binder_free_transaction() and a user calling binder_ioctl(BC_FREE_BUFFER) to release a buffer. It doesn't matter which is first but they need to be protected against running concurrently which can result in a UAF.
--- drivers/android/binder.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/android/binder.c +14 -2
@@ -1941,8 +1941,18 @@ static void binder_free_txn_fixups(struct binder_transaction *t)static void binder_free_transaction (struct binder_transaction *t) { -if (t->buffer) - t->buffer->transaction =NULL ; +struct binder_proc *target_proc = t->to_proc; + +if (target_proc) { +binder_inner_proc_lock (target_proc); +if (t->buffer) + t->buffer->transaction =NULL ; +binder_inner_proc_unlock (target_proc); + } +/* +* If the transaction has no target_proc, then +* t->buffer->transaction has already been cleared. +*/ binder_free_txn_fixups (t);kfree (t);binder_stats_deleted (BINDER_STAT_TRANSACTION );
@@ -3551,10 +3561,12 @@ static void binder_transaction(struct binder_proc *proc,static void binder_free_buf (struct binder_proc *proc,struct binder_buffer *buffer) { +binder_inner_proc_lock (proc);if (buffer->transaction) { buffer->transaction->buffer =NULL ; buffer->transaction =NULL ; } +binder_inner_proc_unlock (proc);if (buffer->async_transaction && buffer->target_node) {struct binder_node *buf_node;struct binder_work *w;
Signature · 1 line
2.22.0.rc2.383.gf4fbbf30c2-goog
Greg KH
maintainerQuoted 11 lines · Todd Kjos
There is a race between the binder driver cleaning up a completed transaction via
binder_free_transaction()and a user callingbinder_ioctl(BC_FREE_BUFFER)to release a buffer. It doesn't matter which is first but they need to be protected against running concurrently which can result in a UAF.Signed-off-by Todd Kjos <[email protected]>--- drivers/android/binder.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
Does this also need to go to the stable kernels?
thanks,
greg k-h
Quoted 9 lines · Greg KH
Quoted 7 lines · Todd Kjos
There is a race between the binder driver cleaning up a completed transaction via
binder_free_transaction()and a user callingbinder_ioctl(BC_FREE_BUFFER)to release a buffer. It doesn't matter which is first but they need to be protected against running concurrently which can result in a UAF.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Todd Kjos <[email protected]>--- drivers/android/binder.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)Does this also need to go to the stable kernels?
This patch won't apply cleanly to stable kernels so I'll submit a new patch directly to stable@ (4.14, 4.19) once this one lands.
Quoted 4 lines
thanks,
greg k-h