diff options
| author | Riley Andrews <riandrews@android.com> | 2015-05-28 15:10:14 -0700 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 01:51:05 +0100 |
| commit | f44b24854532fa8d4e00874194360edc08ba7904 (patch) | |
| tree | d7f575a5a3b991b94c601cb76a2d2dd4ba18471e | |
| parent | a021213dcb1de410e178a313157cdd3682cc7afa (diff) | |
| download | kernel_samsung_smdk4412-f44b24854532fa8d4e00874194360edc08ba7904.zip kernel_samsung_smdk4412-f44b24854532fa8d4e00874194360edc08ba7904.tar.gz kernel_samsung_smdk4412-f44b24854532fa8d4e00874194360edc08ba7904.tar.bz2 | |
android: drivers: workaround debugfs race in binder
If a /d/binder/proc/[pid] entry is kept open after linux has
torn down the associated process, binder_proc_show can deference
an invalid binder_proc that has been stashed in the debugfs
inode. Validate that the binder_proc ptr passed into binder_proc_show
has not been freed by looking for it within the global process list
whilst the global lock is held. If the ptr is not valid, print nothing.
Bug 19587483
Change-Id: I4abc6443d96cca6500608976cded5ff3d1697d33
Signed-off-by: Riley Andrews <riandrews@android.com>
| -rw-r--r-- | drivers/staging/android/binder.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index aad750b..42b23f6 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -3545,13 +3545,25 @@ static int binder_transactions_show(struct seq_file *m, void *unused) static int binder_proc_show(struct seq_file *m, void *unused) { + struct binder_proc *itr; struct binder_proc *proc = m->private; + struct hlist_node *pos; int do_lock = !binder_debug_no_lock; + bool valid_proc = false; if (do_lock) - mutex_lock(&binder_lock); - seq_puts(m, "binder proc state:\n"); - print_binder_proc(m, proc, 1); + binder_lock(__func__); + + hlist_for_each_entry(itr, pos, &binder_procs, proc_node) { + if (itr == proc) { + valid_proc = true; + break; + } + } + if (valid_proc) { + seq_puts(m, "binder proc state:\n"); + print_binder_proc(m, proc, 1); + } if (do_lock) mutex_unlock(&binder_lock); return 0; |