diff options
| author | Riley Andrews <riandrews@google.com> | 2015-01-09 19:08:03 -0800 |
|---|---|---|
| committer | Riley Andrews <riandrews@google.com> | 2015-01-13 22:33:06 +0000 |
| commit | 7d97028e4c6727decc14fa7d6e6d3d846dbb1de0 (patch) | |
| tree | 85d88192dac6aabad2ac438266d3d51235bc4ca7 | |
| parent | c0d201a31f799a74efa0faa8638d738794fac46b (diff) | |
Revert "Staging: android: binder: More offset validation."
This reverts commit 3fac2c119f537d4d8fea3f0b9063d72f44857b82.
Change-Id: I8840b43eceff9ef52d9bae2079d22046488a4ec2
| -rw-r--r-- | drivers/staging/android/binder.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index 9c821f398cad..e718c84372a6 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -1307,7 +1307,6 @@ 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; @@ -1506,23 +1505,17 @@ 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 (min %lld, max %lld)\n", - proc->pid, thread->pid, (u64)*offp, - (u64)off_min, - (u64)(t->buffer->data_size - - sizeof(*fp))); + binder_user_error("%d:%d got transaction with invalid offset, %lld\n", + proc->pid, thread->pid, (u64)*offp); 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: { |