diff options
| author | Carlos Llamas <cmllamas@google.com> | 2023-12-01 17:21:33 +0000 |
|---|---|---|
| committer | Rick Yiu <rickyiu@google.com> | 2024-01-17 02:54:37 +0000 |
| commit | a2abff40961a7870c6c974d38a8c88360e7e8c0a (patch) | |
| tree | de59da867e9f5ab69852976cab406b4e24b22b68 | |
| parent | 48abdcf7936a2d63fc5ff3ef3ba2f1a95821471b (diff) | |
| download | gs-a2abff40961a7870c6c974d38a8c88360e7e8c0a.tar.gz | |
FROMGIT: binder: fix async space check for 0-sized buffers
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: 74310e06be4d ("android: binder: Move buffer out of area shared with user space")
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Link: https://lore.kernel.org/r/20231201172212.1813387-5-cmllamas@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bug: 254650075
Bug: 320576997
(cherry picked from commit 3091c21d3e9322428691ce0b7a0cfa9c0b239eeb
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
char-misc-next)
Change-Id: I0c3a2378fb7e9c534ffe015dee849196f83aa252
Signed-off-by: Carlos Llamas <cmllamas@google.com>
| -rw-r--r-- | drivers/android/binder_alloc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index dc2e8a422c04..ea06c9f99266 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -423,6 +423,10 @@ static struct binder_buffer *binder_alloc_new_buf_locked( return ERR_PTR(-EINVAL); } trace_android_vh_binder_alloc_new_buf_locked(size, alloc, is_async); + + /* 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, @@ -431,9 +435,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); |