Skip to content

Commit cfd0d84

Browse files
toddkjosgregkh
authored andcommitted
binder: fix async_free_space accounting for empty parcels
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 <[email protected]> Cc: [email protected] # 4.14+ Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 2585cf9 commit cfd0d84

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/android/binder_alloc.c

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

673673
if (buffer->async_transaction) {
674-
alloc->free_async_space += size + sizeof(struct binder_buffer);
674+
alloc->free_async_space += buffer_size + sizeof(struct binder_buffer);
675675

676676
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
677677
"%d: binder_free_buf size %zd async free %zd\n",

0 commit comments

Comments
 (0)