Skip to contentSkip to conversation

android: binder: Fix lockdep check on clearing vma

PATCH Applied Liam Howlett 2 participants 2 messages Jun 27, 2022 Android drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 android: binder: Fix lockdep check on clearing vma

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.

Reported-by [email protected]
Fixes 472a68df605b ("android: binder: stop saving a pointer to the VMA")
---
 drivers/android/binder_alloc.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/android/binder_alloc.c +8 -1
index f555eebceef6..1014beb12802 100644
@@ -315,12 +315,19 @@ static inline void binder_alloc_set_vma(struct binder_alloc *alloc,
 {
 	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;
 }
 
Signature · 1 line
2.35.1
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Liam Howlett

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.

Reported-by [email protected]
Fixes 472a68df605b ("android: binder: stop saving a pointer to the VMA")
Quoted 31 lines
---
 drivers/android/binder_alloc.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/android/binder_alloc.c +8 -2
index f555eebceef6..1014beb12802 100644
@@ -315,12 +315,19 @@ static inline void binder_alloc_set_vma(struct binder_alloc *alloc,
 {
        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;
 }
 
--

2.35.1