Commit 5997da82 authored Mar 20, 2019 by Todd Kjos Committed by Greg Kroah-Hartman Mar 21, 2019

binder: fix BUG_ON found by selinux-testsuite



The selinux-testsuite found an issue resulting in a BUG_ON()
where a conditional relied on a size_t going negative when
checking the validity of a buffer offset.

Fixes: 7a67a393 ("binder: add function to copy binder object from buffer")
Reported-by: Paul Moore <paul@paul-moore.com>
Tested-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9e98c678

drivers/android/binder.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2057,7 +2057,8 @@ 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) \|\| !IS_ALIGNED(offset, sizeof(u32)))
		if (offset > buffer->data_size \|\| read_size < sizeof(*hdr) \|\|
		!IS_ALIGNED(offset, sizeof(u32)))
		return 0;
		binder_alloc_copy_from_buffer(&proc->alloc, object, buffer,
		offset, read_size);

Admin message