Commit 9bad743e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2d40060b 3a0152b2

drivers/android/binder_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static void binder_free_buf_locked(struct binder_alloc *alloc, 
	BUG_ON(buffer->user_data > alloc->buffer + alloc->buffer_size);



	if (buffer->async_transaction) {

		alloc->free_async_space += size + sizeof(struct binder_buffer);

		alloc->free_async_space += buffer_size + sizeof(struct binder_buffer);



		binder_alloc_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,

			     "%d: binder_free_buf size %zd async free %zd\n",

drivers/virt/nitro_enclaves/ne_misc_dev.c

+3 −2
Original line number Diff line number Diff line
@@ -886,8 +886,9 @@ static int ne_set_user_memory_region_ioctl(struct ne_enclave *ne_enclave, 
			goto put_pages;

		}



		gup_rc = get_user_pages(mem_region.userspace_addr + memory_size, 1, FOLL_GET,

					ne_mem_region->pages + i, NULL);

		gup_rc = get_user_pages_unlocked(mem_region.userspace_addr + memory_size, 1,

						 ne_mem_region->pages + i, FOLL_GET);



		if (gup_rc < 0) {

			rc = gup_rc;