diff options
| author | Carlos Llamas <cmllamas@google.com> | 2024-03-30 19:01:14 +0000 |
|---|---|---|
| committer | Lee Jones <joneslee@google.com> | 2024-04-18 11:43:30 +0100 |
| commit | 86c830273096bd1c55e51c8b6df3d909e6b3bf04 (patch) | |
| tree | d86ad1289074ffea17a6bb54af6069a3f062aa3d | |
| parent | 98bed5c7dc04e178bfae2b580de2ac65f9a20d94 (diff) | |
| download | common-android14-5.15-2024-02.tar.gz | |
FROMLIST: binder: check offset alignment in binder_get_object()android14-5.15-2024-02
Commit 6d98eb95b450 ("binder: avoid potential data leakage when copying
txn") introduced changes to how binder objects are copied. In doing so,
it unintentionally removed an offset alignment check done through calls
to binder_alloc_copy_from_buffer() -> check_buffer().
These calls were replaced in binder_get_object() with copy_from_user(),
so now an explicit offset alignment check is needed here. This avoids
later complications when unwinding the objects gets harder.
It is worth noting this check existed prior to commit 7a67a39320df
("binder: add function to copy binder object from buffer"), likely
removed due to redundancy at the time.
Fixes: 6d98eb95b450 ("binder: avoid potential data leakage when copying txn")
Cc: <stable@vger.kernel.org>
Acked-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Bug: 320661088
Link: https://lore.kernel.org/all/20240330190115.1877819-1-cmllamas@google.com/
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: Iaddabaa28de7ba7b7d35dbb639d38ca79dbc5077
(cherry picked from commit 0c9784b747c6a960e5b922e9ccff382db1b73ce4)
Signed-off-by: Lee Jones <joneslee@google.com>
| -rw-r--r-- | drivers/android/binder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 57295e600607..29f6a1bd739c 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -1915,8 +1915,10 @@ static size_t binder_get_object(struct binder_proc *proc, size_t object_size = 0; read_size = min_t(size_t, sizeof(*object), buffer->data_size - offset); - if (offset > buffer->data_size || read_size < sizeof(*hdr)) + if (offset > buffer->data_size || read_size < sizeof(*hdr) || + !IS_ALIGNED(offset, sizeof(u32))) return 0; + if (u) { if (copy_from_user(object, u + offset, read_size)) return 0; |