Skip to content

Commit 1cb8444

Browse files
toddkjosgregkh
authored andcommitted
binder: fix async_free_space accounting for empty parcels
commit cfd0d84 upstream. In 4.13, commit 74310e0 ("android: binder: Move buffer out of area shared with user space") fixed a kernel structure visibility issue. As part of that patch, sizeof(void *) was used as the buffer size for 0-length data payloads so the driver could detect abusive clients sending 0-length asynchronous transactions to a server by enforcing limits on async_free_size. Unfortunately, on the "free" side, the accounting of async_free_space did not add the sizeof(void *) back. The result was that up to 8-bytes of async_free_space were leaked on every async transaction of 8-bytes or less. These small transactions are uncommon, so this accounting issue has gone undetected for several years. The fix is to use "buffer_size" (the allocated buffer size) instead of "size" (the logical buffer size) when updating the async_free_space during the free operation. These are the same except for this corner case of asynchronous transactions with payloads < 8 bytes. Fixes: 74310e0 ("android: binder: Move buffer out of area shared with user space") Signed-off-by: Todd Kjos <tkjos@google.com> Cc: stable@vger.kernel.org # 4.14+ Link: https://lore.kernel.org/r/20211220190150.2107077-1-tkjos@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a6e2625 commit 1cb8444

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/android/binder_alloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ static void binder_free_buf_locked(struct binder_alloc *alloc,
662662
BUG_ON(buffer->user_data > alloc->buffer + alloc->buffer_size);
663663

664664
if (buffer->async_transaction) {
665-
alloc->free_async_space += size + sizeof(struct binder_buffer);
665+
alloc->free_async_space += buffer_size + sizeof(struct binder_buffer);
666666

667667
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
668668
"%d: binder_free_buf size %zd async free %zd\n",

0 commit comments

Comments
 (0)