android-binder-fix-lockdep-check-on-clearing-vma.patch removed from -mm tree
The quilt patch titled
Subject: android: binder: fix lockdep check on clearing vma
has been removed from the -mm tree. Its filename was
android-binder-fix-lockdep-check-on-clearing-vma.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Liam Howlett <[email protected]>
Subject: android: binder: fix lockdep check on clearing vma
Date: Mon, 27 Jun 2022 15:18:59 +0000
When munmapping a vma, the mmap_lock can be degraded to a write before calling close() on the file handle. The binder close() function calls binder_alloc_set_vma() to clear the vma address, which now has a lock dep check for writing on the mmap_lock. Change the lockdep check to ensure the reading lock is held while clearing and keep the write check while writing.
---
drivers/android/binder_alloc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/android/binder_alloc.c renamed from drivers/android/binder_alloc.c~android-binder-fix-lockdep-check-on-clearing-vma +8 -1
@@ -315,12 +315,19 @@ static inline void binder_alloc_set_vma( {unsigned long vm_start =0 ; +/* +* Allow clearing the vma with holding just the read lock to allow +* munmapping downgrade of the write lock before freeing and closing the +* file using binder_alloc_vma_close(). +*/ if (vma) { vm_start = vma->vm_start; alloc->vma_vm_mm = vma->vm_mm; +mmap_assert_write_locked (alloc->vma_vm_mm); + }else { +mmap_assert_locked (alloc->vma_vm_mm); } -mmap_assert_write_locked (alloc->vma_vm_mm); alloc->vma_addr = vm_start; }
_
Patches currently in -mm which might be from [email protected] are