diff options
| author | Arve Hjønnevåg <arve@android.com> | 2014-02-13 20:25:06 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-03-19 13:11:06 -0700 |
| commit | 457c3cd05958b8397211ae1f6dd3c3d325f4c0ea (patch) | |
| tree | 41a43c44bdbd5b21cc2662edd16231399a06a6d9 | |
| parent | 45ec5ed08ad75b7c0b06f36682f1cd8453fbe8fc (diff) | |
Staging: android: binder: More offset validation.
Make sure offsets don't point to overlapping flat_binder_object
structs.
Change-Id: I425ab0c46fbe2b00ed679c5becf9e8140395eb40
Signed-off-by: Arve Hjønnevåg <arve@android.com>
| -rw-r--r-- | drivers/staging/android/binder.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index f6a82a53baa3..f66abb0c8943 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -1306,6 +1306,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; @@ -1504,17 +1505,23 @@ 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: { |