Commit e10e23f9 authored Nov 26, 2018 by Todd Kjos Committed by Gerrit - the friendly Code Review server Mar 14, 2019

binder: fix race between munmap() and direct reclaim



An munmap() on a binder device causes binder_vma_close() to be called
which clears the alloc->vma pointer.

If direct reclaim causes binder_alloc_free_page() to be called, there
is a race where alloc->vma is read into a local vma pointer and then
used later after the mm->mmap_sem is acquired. This can result in
calling zap_page_range() with an invalid vma which manifests as a
use-after-free in zap_page_range().

The fix is to check alloc->vma after acquiring the mmap_sem (which we
were acquiring anyway) and bail out of binder_alloc_free_page() if it
has changed to NULL.

Change-Id: I9ea0558a57635a747d7a48ed35991d39b860abf6
Signed-off-by: Todd Kjos <tkjos@google.com>
Git-repo: https://android.googlesource.com/kernel/msm


Git-commit: 5dbdd3698e85ba9a461a8c4d47994f05b369d332
Signed-off-by: Dennis Cagle <dcagle@codeaurora.org>

parent 38ec7e0c

drivers/android/binder_alloc.c

+8 −10

Original line number	Diff line number	Diff line
		@@ -924,14 +924,13 @@ enum lru_status binder_alloc_free_page(struct list_head *item,

		index = page - alloc->pages;
		page_addr = (uintptr_t)alloc->buffer + index * PAGE_SIZE;
		vma = alloc->vma;
		if (vma) {
		if (!mmget_not_zero(alloc->vma_vm_mm))
		goto err_mmget;

		mm = alloc->vma_vm_mm;
		if (!mmget_not_zero(mm))
		goto err_mmget;
		if (!down_write_trylock(&mm->mmap_sem))
		goto err_down_write_mmap_sem_failed;
		}
		vma = alloc->vma;

		list_lru_isolate(lru, item);
		spin_unlock(lock);
		@@ -945,10 +944,9 @@ enum lru_status binder_alloc_free_page(struct list_head *item,
		PAGE_SIZE, NULL);

		trace_binder_unmap_user_end(alloc, index);

		}
		up_write(&mm->mmap_sem);
		mmput(mm);
		}

		trace_binder_unmap_kernel_start(alloc, index);