Skip to contentSkip to conversation

Binder updates from the experiemental/android-4.4 tree

PATCH New John Stultz 1 participant 3 messages Feb 10, 2016 Android drivers

lore
Share & tools
lore
#0 lore raw

cover Binder updates from the experiemental/android-4.4 tree

I noticed there were a few changes from the AOSP side to binder, so I wanted to send them out to resync w/ upstream.

These have been tested on the HiKey board with the rest of the android-4.4 kernel changes.

Let me know if there are any concerns or objections.

thanks
-john

Cc Colin Cross <[email protected]>
Cc Arve Hjønnevåg <[email protected]>
Cc Dmitry Shmidt <[email protected]>
Cc Rom Lemarchand <[email protected]>
Cc Serban Constantinescu <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Android Kernel Team <[email protected]>

Arve Hjønnevåg (1):
android: binder: More offset validation

Riley Andrews (1):
android: drivers: Avoid debugfs race in binder

 drivers/android/binder.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/2 android: binder: More offset validation

From: Arve Hjønnevåg <[email protected]>

Make sure offsets don't point to overlapping flat_binder_object structs.

Cc Colin Cross <[email protected]>
Cc Arve Hjønnevåg <[email protected]>
Cc Dmitry Shmidt <[email protected]>
Cc Rom Lemarchand <[email protected]>
Cc Serban Constantinescu <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Android Kernel Team <[email protected]>
---
 drivers/android/binder.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/android/binder.c +9 -2
index a39e85f..1db3761 100644
@@ -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: {
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/2 android: drivers: Avoid debugfs race in binder

In reply to John Stultz

From: Riley Andrews <[email protected]>

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.

Cc Colin Cross <[email protected]>
Cc Arve Hjønnevåg <[email protected]>
Cc Dmitry Shmidt <[email protected]>
Cc Rom Lemarchand <[email protected]>
Cc Serban Constantinescu <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Android Kernel Team <[email protected]>
[jstultz: Minor commit message tweaks]
---
 drivers/android/binder.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/android/binder.c +13 -2
index 1db3761..f0ce995 100644
@@ -3600,13 +3600,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;
Signature · 1 line
1.9.1