UPSTREAM: binder: fix handling of misaligned binder object

Fixes crash found by syzbot:
kernel BUG at drivers/android/binder_alloc.c:LINE! (2)

(cherry pick from commit 26528be6720bb40bc8844e97ee73a37e530e9c5e)
Bug: 67668716
Reported-and-tested-by: syzbot+55de1eb4975dec156d8f@syzkaller.appspotmail.com
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: Ib8597dd05a158f78503d4affe6c5f46ded16a811

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 445f1d4586ecca2a59149036a150d5e804228d33..94e2872cff03da168f82aad97e0bd277e8ffa8b1 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2239,7 +2239,7 @@ 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 (read_size < sizeof(*hdr))
+       if (read_size < sizeof(*hdr) || !IS_ALIGNED(offset, sizeof(u32)))
                return 0;
        binder_alloc_copy_from_buffer(&proc->alloc, object, buffer,
                                      offset, read_size);