Merge char-misc-next into staging-next

This resolves the merge issues and confusions people were having with
the goldfish drivers due to changes for them showing up in two different
trees.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 22 insertions, 4 deletions

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index f080a8b7659b..796301a7c4fb 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -1321,6 +1321,7 @@ static void binder_transaction(struct binder_proc *proc,
         struct binder_transaction *t;
         struct binder_work *tcomplete;
         binder_size_t *offp, *off_end;
+        binder_size_t off_min;
         struct binder_proc *target_proc;
         struct binder_thread *target_thread = NULL;
         struct binder_node *target_node = NULL;
@@ -1522,18 +1523,24 @@ static void binder_transaction(struct binder_proc *proc,
                 goto err_bad_offset;
         }
         off_end = (void *)offp + tr->offsets_size;
+        off_min = 0;
         for (; offp < off_end; offp++) {
                 struct flat_binder_object *fp;
 
                 if (*offp > t->buffer->data_size - sizeof(*fp) ||
+                    *offp < off_min ||
                     t->buffer->data_size < sizeof(*fp) ||
                     !IS_ALIGNED(*offp, sizeof(u32))) {
-                        binder_user_error("%d:%d got transaction with invalid offset, %lld\n",
-                                          proc->pid, thread->pid, (u64)*offp);
+                        binder_user_error("%d:%d got transaction with invalid offset, %lld (min %lld, max %lld)\n",
+                                          proc->pid, thread->pid, (u64)*offp,
+                                          (u64)off_min,
+                                          (u64)(t->buffer->data_size -
+                                          sizeof(*fp)));
                         return_error = BR_FAILED_REPLY;
                         goto err_bad_offset;
                 }
                 fp = (struct flat_binder_object *)(t->buffer->data + *offp);
+                off_min = *offp + sizeof(struct flat_binder_object);
                 switch (fp->type) {
                 case BINDER_TYPE_BINDER:
                 case BINDER_TYPE_WEAK_BINDER: {
@@ -3598,13 +3605,24 @@ 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;
         int do_lock = !binder_debug_no_lock;
+        bool valid_proc = false;
 
         if (do_lock)
                 binder_lock(__func__);
-        seq_puts(m, "binder proc state:\n");
-        print_binder_proc(m, proc, 1);
+
+        hlist_for_each_entry(itr, &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)
                 binder_unlock(__func__);
         return 0;