Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'char-misc-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fixes from Greg KH:
"Here are two misc driver fixes for 5.16-final:
- binder accounting fix to resolve reported problem
- nitro_enclaves fix for mmap assert warning output
Both of these have been for over a week with no reported issues"
* tag 'char-misc-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
nitro_enclaves: Use get_user_pages_unlocked() call to handle mmap assert
binder: fix async_free_space accounting for empty parcels
+4
-3
+1
-1
drivers/android/binder_alloc.c
+1
-1
drivers/android/binder_alloc.c
···
671
671
BUG_ON(buffer->user_data > alloc->buffer + alloc->buffer_size);
672
672
673
673
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);
675
675
676
676
binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
677
677
"%d: binder_free_buf size %zd async free %zd\n",
+3
-2
drivers/virt/nitro_enclaves/ne_misc_dev.c
+3
-2
drivers/virt/nitro_enclaves/ne_misc_dev.c
···
886
886
goto put_pages;
887
887
}
888
888
889
-
gup_rc = get_user_pages(mem_region.userspace_addr + memory_size, 1, FOLL_GET,
890
-
ne_mem_region->pages + i, NULL);
889
+
gup_rc = get_user_pages_unlocked(mem_region.userspace_addr + memory_size, 1,
890
+
ne_mem_region->pages + i, FOLL_GET);
891
+
891
892
if (gup_rc < 0) {
892
893
rc = gup_rc;
893
894