Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc1119a3 authored by Carlos Llamas's avatar Carlos Llamas Committed by Greg Kroah-Hartman
Browse files

binder: fix async space check for 0-sized buffers 



commit 3091c21d3e9322428691ce0b7a0cfa9c0b239eeb upstream.

Move the padding of 0-sized buffers to an earlier stage to account for
this round up during the alloc->free_async_space check.

Fixes: 74310e06 ("android: binder: Move buffer out of area shared with user space")
Reviewed-by: default avatarAlice Ryhl <aliceryhl@google.com>
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
Link: https://lore.kernel.org/r/20231201172212.1813387-5-cmllamas@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b7c0392

drivers/android/binder_alloc.c

+4 −3
Original line number Diff line number Diff line
@@ -378,6 +378,10 @@ static struct binder_buffer *binder_alloc_new_buf_locked( 
				alloc->pid, extra_buffers_size);

		return ERR_PTR(-EINVAL);

	}



	/* Pad 0-size buffers so they get assigned unique addresses */

	size = max(size, sizeof(void *));



	if (is_async &&

	    alloc->free_async_space < size + sizeof(struct binder_buffer)) {

		binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC,
@@ -386,9 +390,6 @@ static struct binder_buffer *binder_alloc_new_buf_locked( 
		return ERR_PTR(-ENOSPC);

	}



	/* Pad 0-size buffers so they get assigned unique addresses */

	size = max(size, sizeof(void *));



	while (n) {

		buffer = rb_entry(n, struct binder_buffer, rb_node);

		BUG_ON(!buffer->free);