diff options
| author | Martijn Coenen <maco@android.com> | 2018-01-05 11:27:07 +0100 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2019-11-04 11:25:12 -0800 |
| commit | 82bd53b8713775eeacd21c12fc5ca1964337e8b6 (patch) | |
| tree | 9d2db46b755c435229d4a93d0a393bcd61eda39c | |
| parent | c1b34ae4e276a1db5a3b252f769c7b914afe72a9 (diff) | |
UPSTREAM: ANDROID: binder: remove waitqueue when thread exits.ASB-2019-11-05_4.4-o-release
binder_poll() passes the thread->wait waitqueue that
can be slept on for work. When a thread that uses
epoll explicitly exits using BINDER_THREAD_EXIT,
the waitqueue is freed, but it is never removed
from the corresponding epoll data structure. When
the process subsequently exits, the epoll cleanup
code tries to access the waitlist, which results in
a use-after-free.
Prevent this by using POLLFREE when the thread exits.
(cherry picked from commit f5cb779ba16334b45ba8946d6bfa6d9834d1527f)
Change-Id: Ib34b1cbb8ab2192d78c3d9956b2f963a66ecad2e
Signed-off-by: Martijn Coenen <maco@android.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Cc: stable <stable@vger.kernel.org> # 4.14
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/android/binder.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index d75516005e7c..f447cae4353b 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -4494,6 +4494,18 @@ static int binder_thread_release(struct binder_proc *proc, if (t) spin_lock(&t->lock); } + + /* + * If this thread used poll, make sure we remove the waitqueue + * from any epoll data structures holding it with POLLFREE. + * waitqueue_active() is safe to use here because we're holding + * the inner lock. + */ + if ((thread->looper & BINDER_LOOPER_STATE_POLL) && + waitqueue_active(&thread->wait)) { + wake_up_poll(&thread->wait, POLLHUP | POLLFREE); + } + binder_inner_proc_unlock(thread->proc); if (send_reply) |