Commit 70d7ef53 authored Feb 14, 2019 by Todd Kjos Committed by Todd Kjos Mar 25, 2019

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

parent 557929bd

drivers/android/binder.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2240,7 +2240,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);