diff options
| author | Todd Kjos <tkjos@android.com> | 2019-12-13 12:25:31 -0800 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2020-03-03 17:43:36 -0800 |
| commit | e9ff34ad792247c1f99922ee9f4be84e284e6eaf (patch) | |
| tree | 652fdf738a030796b2ddda6a245822600eb4eaa3 | |
| parent | 30e26cfdfe1a9323b77b687b458e9ae76897c16d (diff) | |
UPSTREAM: binder: fix incorrect calculation for num_validASB-2020-03-05_4.14-q
commit 16981742717b04644a41052570fb502682a315d2 upstream.
For BINDER_TYPE_PTR and BINDER_TYPE_FDA transactions, the
num_valid local was calculated incorrectly causing the
range check in binder_validate_ptr() to miss out-of-bounds
offsets.
Fixes: bde4a19fc04f ("binder: use userspace pointer as base of buffer space")
Change-Id: Ida77db13d8e5b726f0b14513f55c2b30277338cd
Signed-off-by: Todd Kjos <tkjos@google.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20191213202531.55010-1-tkjos@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bug: 145988638
Signed-off-by: Todd Kjos <tkjos@google.com>
| -rw-r--r-- | drivers/android/binder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index f6ddec245187..2c8b629c90c3 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -3428,7 +3428,7 @@ static void binder_transaction(struct binder_proc *proc, binder_size_t parent_offset; struct binder_fd_array_object *fda = to_binder_fd_array_object(hdr); - size_t num_valid = (buffer_offset - off_start_offset) * + size_t num_valid = (buffer_offset - off_start_offset) / sizeof(binder_size_t); struct binder_buffer_object *parent = binder_validate_ptr(target_proc, t->buffer, @@ -3502,7 +3502,7 @@ static void binder_transaction(struct binder_proc *proc, t->buffer->user_data + sg_buf_offset; sg_buf_offset += ALIGN(bp->length, sizeof(u64)); - num_valid = (buffer_offset - off_start_offset) * + num_valid = (buffer_offset - off_start_offset) / sizeof(binder_size_t); ret = binder_fixup_parent(t, thread, bp, off_start_offset, |