fix null-ptr-deref in binder_alloc and others
Subsystems (2)
Carlos Llamas
maintainercover fix null-ptr-deref in binder_alloc and others
This patch series fixes primarily a null dereference of alloc->vma_vm_mm reported by syzbot which unfortunately is quite easy to reproduce. Also, included here are several other patches for more trivial things I found along the way.
--
Carlos Llamas
Carlos Llamas (7):
binder: fix alloc->vma_vm_mm null-ptr dereference
binder: fix trivial kernel-doc typo
binder: rename alloc->vma_vm_mm to alloc->mm
binder: remove binder_alloc_set_vma()
binder: remove unused binder_alloc->buffer_free
binder: fix binder_alloc kernel-doc warnings
binderfs: remove unused INTSTRLEN macro
drivers/android/binder_alloc.c | 55 +++++++++++----------------------- drivers/android/binder_alloc.h | 12 ++++---- drivers/android/binderfs.c | 1 - 3 files changed, 22 insertions(+), 46 deletions(-)
Signature · 1 line
2.37.2.672.g94769d06f0-goog
Carlos Llamas
maintainerPATCH 1/7 binder: fix alloc->vma_vm_mm null-ptr dereference
Syzbot reported a couple issues introduced by commit 44e602b4e52f ("binder_alloc: add missing mmap_lock calls when using the VMA"), in which we attempt to acquire the mmap_lock when alloc->vma_vm_mm has not been initialized yet.
This can happen if a binder_proc receives a transaction without having previously called mmap() to setup the binder_proc->alloc space in [1]. Also, a similar issue occurs via binder_alloc_print_pages() when we try to dump the debugfs binder stats file in [2].
Sample of syzbot's crash report:
==================================================================
KASAN: null-ptr-deref in range [0x0000000000000128-0x000000000000012f] CPU: 0 PID: 3755 Comm: syz-executor229 Not tainted 6.0.0-rc1-next-20220819-syzkaller #0 syz-executor229[3755] cmdline: ./syz-executor2294415195 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/22/2022 RIP: 0010:__lock_acquire+0xd83/0x56d0 kernel/locking/lockdep.c:4923 [...] Call Trace: <TASK> lock_acquire kernel/locking/lockdep.c:5666 [inline] lock_acquire+0x1ab/0x570 kernel/locking/lockdep.c:5631 down_read+0x98/0x450 kernel/locking/rwsem.c:1499 mmap_read_lock include/linux/mmap_lock.h:117 [inline] binder_alloc_new_buf_locked drivers/android/binder_alloc.c:405 [inline] binder_alloc_new_buf+0xa5/0x19e0 drivers/android/binder_alloc.c:593 binder_transaction+0x242e/0x9a80 drivers/android/binder.c:3199 binder_thread_write+0x664/0x3220 drivers/android/binder.c:3986 binder_ioctl_write_read drivers/android/binder.c:5036 [inline] binder_ioctl+0x3470/0x6d00 drivers/android/binder.c:5323 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:870 [inline] __se_sys_ioctl fs/ioctl.c:856 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:856 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd [...] ==================================================================
Fix these issues by setting up alloc->vma_vm_mm pointer during open() and caching directly from current->mm. This guarantees we have a valid reference to take the mmap_lock during scenarios described above.
[1] https://syzkaller.appspot.com/bug?extid=f7dc54e5be28950ac459
[2] https://syzkaller.appspot.com/bug?extid=a75ebe0452711c9e56d9
--- drivers/android/binder_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/android/binder_alloc.c +2 -2
@@ -322,7 +322,6 @@ static inline void binder_alloc_set_vma(struct binder_alloc *alloc,*/ 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);
@@ -795,7 +794,6 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc,binder_insert_free_buffer (alloc, buffer); alloc->free_async_space = alloc->buffer_size /2 ;binder_alloc_set_vma (alloc, vma); -mmgrab (alloc->vma_vm_mm);return 0 ;
@@ -1091,6 +1089,8 @@ static struct shrinker binder_shrinker = {void binder_alloc_init (struct binder_alloc *alloc) { alloc->pid = current->group_leader->pid; + alloc->vma_vm_mm = current->mm; +mmgrab (alloc->vma_vm_mm);mutex_init (&alloc->mutex);INIT_LIST_HEAD (&alloc->buffers); }
Signature · 1 line
2.37.2.672.g94769d06f0-goog
Re: [PATCH 1/7] binder: fix alloc->vma_vm_mm null-ptr dereference
Quoted 9 lines · On Mon, 29 Aug 2022 20:12:48 +0000 Carlos Llamas <[email protected]> wrote:
Syzbot reported a couple issues introduced by commit
44e602b4e52f("binder_alloc: add missingmmap_lockcalls when using the VMA"), in which we attempt to acquire themmap_lockwhenalloc->vma_vm_mmhas not been initialized yet.This can happen if a
binder_procreceives a transaction without having previously calledmmap()to setup thebinder_proc->allocspace in [1]. Also, a similar issue occurs viabinder_alloc_print_pages()when we try to dump the debugfs binder stats file in [2].
Thanks. I assume you'll be merging all these into mainline?
Quoted 5 lines
Fixes 44e602b4e52f ("binder_alloc: add missing mmap_lock calls when using the VMA")Reported-by [email protected]Reported-by [email protected]Cc <[email protected]> # v5.15+
44e602b4e52f is only present in 6.0-rcX?
Carlos Llamas
maintainerRe: [PATCH 1/7] binder: fix alloc->vma_vm_mm null-ptr dereference
Quoted 7 lines · Andrew Morton
Quoted 5 lines · On Mon, 29 Aug 2022 20:12:48 +0000 Carlos Llamas <[email protected]> wrote:
Syzbot reported a couple issues introduced by commit
44e602b4e52f("binder_alloc: add missingmmap_lockcalls when using the VMA"), in which we attempt to acquire themmap_lockwhenalloc->vma_vm_mmhas not been initialized yet.
Quoted 6 lines
Quoted 4 lines
This can happen if a
binder_procreceives a transaction without having previously calledmmap()to setup thebinder_proc->allocspace in [1]. Also, a similar issue occurs viabinder_alloc_print_pages()when we try to dump the debugfs binder stats file in [2].Thanks. I assume you'll be merging all these into mainline?
Yes, I believe Greg will pick up these patches into his char-misc tree.
Quoted 8 lines
Quoted 6 lines
Fixes 44e602b4e52f ("binder_alloc: add missing mmap_lock calls when using the VMA")Reported-by [email protected]Reported-by [email protected]Cc <[email protected]> # v5.15+
44e602b4e52fis only present in 6.0-rcX?
Right, it was just added to the stable queue earlier today:
https://lore.kernel.org/all/[email protected]/
https://lore.kernel.org/all/[email protected]/
Re: [PATCH 1/7] binder: fix alloc->vma_vm_mm null-ptr dereference
In reply to Carlos LlamasQuoted 62 lines · Carlos Llamas
Syzbot reported a couple issues introduced by commit
44e602b4e52f("binder_alloc: add missingmmap_lockcalls when using the VMA"), in which we attempt to acquire themmap_lockwhenalloc->vma_vm_mmhas not been initialized yet.This can happen if a
binder_procreceives a transaction without having previously calledmmap()to setup thebinder_proc->allocspace in [1]. Also, a similar issue occurs viabinder_alloc_print_pages()when we try to dump the debugfs binder stats file in [2].Sample of syzbot's crash report:
==================================================================KASAN: null-ptr-deref in range [0x0000000000000128-0x000000000000012f] CPU: 0 PID: 3755 Comm: syz-executor229 Not tainted 6.0.0-rc1-next-20220819-syzkaller #0 syz-executor229[3755] cmdline: ./syz-executor2294415195 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/22/2022 RIP: 0010:__lock_acquire+0xd83/0x56d0 kernel/locking/lockdep.c:4923 [...] Call Trace: <TASK> lock_acquire kernel/locking/lockdep.c:5666 [inline] lock_acquire+0x1ab/0x570 kernel/locking/lockdep.c:5631 down_read+0x98/0x450 kernel/locking/rwsem.c:1499 mmap_read_lock include/linux/mmap_lock.h:117 [inline] binder_alloc_new_buf_locked drivers/android/binder_alloc.c:405 [inline] binder_alloc_new_buf+0xa5/0x19e0 drivers/android/binder_alloc.c:593 binder_transaction+0x242e/0x9a80 drivers/android/binder.c:3199 binder_thread_write+0x664/0x3220 drivers/android/binder.c:3986 binder_ioctl_write_read drivers/android/binder.c:5036 [inline] binder_ioctl+0x3470/0x6d00 drivers/android/binder.c:5323 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:870 [inline] __se_sys_ioctl fs/ioctl.c:856 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:856 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd [...] ==================================================================Fix these issues by setting up
alloc->vma_vm_mmpointer duringopen()and caching directly fromcurrent->mm. This guarantees we have a valid reference to take themmap_lockduring scenarios described above.[1] https://syzkaller.appspot.com/bug?extid=f7dc54e5be28950ac459
[2] https://syzkaller.appspot.com/bug?extid=a75ebe0452711c9e56d9Fixes 44e602b4e52f ("binder_alloc: add missing mmap_lock calls when using the VMA")Reported-by [email protected]Reported-by [email protected]Cc <[email protected]> # v5.15+Cc Liam R. Howlett <[email protected]>Signed-off-by Carlos Llamas <[email protected]>--- drivers/android/binder_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/android/binder_alloc.c +0
-0
drivers/android/binder_alloc.c static inline void binder_alloc_set_vma(struct binder_alloc *alloc, · line 325
Quoted 4 lines
drivers/android/binder_alloc.c +0
-1@@ -322,7 +322,6 @@ static inline void binder_alloc_set_vma(struct binder_alloc *alloc,*/ if (vma) { vm_start = vma->vm_start; - alloc->vma_vm_mm = vma->vm_mm;
Is this really the null pointer dereference? We check for vma above..?
Quoted 23 lines
drivers/android/binder_alloc.c +2
-1mmap_assert_write_locked (alloc->vma_vm_mm); }else {mmap_assert_locked (alloc->vma_vm_mm);@@ -795,7 +794,6 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc,binder_insert_free_buffer (alloc, buffer); alloc->free_async_space = alloc->buffer_size /2 ;binder_alloc_set_vma (alloc, vma); -mmgrab (alloc->vma_vm_mm);return 0 ;@@ -1091,6 +1089,8 @@ static struct shrinker binder_shrinker = {void binder_alloc_init (struct binder_alloc *alloc) { alloc->pid = current->group_leader->pid; + alloc->vma_vm_mm = current->mm; +mmgrab (alloc->vma_vm_mm);mutex_init (&alloc->mutex);INIT_LIST_HEAD (&alloc->buffers); }Signature · 1 line
2.37.2.672.g94769d06f0-goog
Carlos Llamas
maintainerRe: [PATCH 1/7] binder: fix alloc->vma_vm_mm null-ptr dereference
Quoted 12 lines · Liam Howlett
drivers/android/binder_alloc.c static inline void binder_alloc_set_vma(struct binder_alloc *alloc, · line 325
Quoted 9 lines
drivers/android/binder_alloc.c +0
-1@@ -322,7 +322,6 @@ static inline void binder_alloc_set_vma(struct binder_alloc *alloc,*/ if (vma) { vm_start = vma->vm_start; - alloc->vma_vm_mm = vma->vm_mm;Is this really the null pointer dereference? We check for vma above..?
Not here. The sequence leading to the null-ptr-deref happens when we try to take alloc->vma_vm_mm->mmap_lock in binder_alloc_new_buf_locked() and in binder_alloc_print_pages() without initializing alloc->vma_vm_mm first (e.g. mmap() was never called). These sequences are described in the commit message but basically they translate to mmap_read_lock(NULL) calls.
Liam Howlett
Reviewed-byRe: [PATCH 1/7] binder: fix alloc->vma_vm_mm null-ptr dereference
Quoted 14 lines · Carlos Llamas
Quoted 12 lines · Liam Howlett
drivers/android/binder_alloc.c static inline void binder_alloc_set_vma(struct binder_alloc *alloc, · line 325
Quoted 9 lines
drivers/android/binder_alloc.c +0
-1@@ -322,7 +322,6 @@ static inline void binder_alloc_set_vma(struct binder_alloc *alloc,*/ if (vma) { vm_start = vma->vm_start; - alloc->vma_vm_mm = vma->vm_mm;Is this really the null pointer dereference? We check for vma above..?
Quoted 6 lines
Not here. The sequence leading to the null-ptr-deref happens when we try to take
alloc->vma_vm_mm->mmap_lockinbinder_alloc_new_buf_locked()and inbinder_alloc_print_pages()without initializingalloc->vma_vm_mmfirst (e.g.mmap()was never called). These sequences are described in the commit message but basically they translate tommap_read_lock(NULL)calls.
Ah, this is unnecessary with the rest of the change.
Feel free to add my reviewed-by if you want.
Re: [PATCH 1/7] binder: fix alloc->vma_vm_mm null-ptr dereference
In reply to Carlos LlamasQuoted 48 lines · Carlos Llamas' via kernel-team
Syzbot reported a couple issues introduced by commit
44e602b4e52f("binder_alloc: add missingmmap_lockcalls when using the VMA"), in which we attempt to acquire themmap_lockwhenalloc->vma_vm_mmhas not been initialized yet.This can happen if a
binder_procreceives a transaction without having previously calledmmap()to setup thebinder_proc->allocspace in [1]. Also, a similar issue occurs viabinder_alloc_print_pages()when we try to dump the debugfs binder stats file in [2].Sample of syzbot's crash report:
==================================================================KASAN: null-ptr-deref in range [0x0000000000000128-0x000000000000012f] CPU: 0 PID: 3755 Comm: syz-executor229 Not tainted 6.0.0-rc1-next-20220819-syzkaller #0 syz-executor229[3755] cmdline: ./syz-executor2294415195 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/22/2022 RIP: 0010:__lock_acquire+0xd83/0x56d0 kernel/locking/lockdep.c:4923 [...] Call Trace: <TASK> lock_acquire kernel/locking/lockdep.c:5666 [inline] lock_acquire+0x1ab/0x570 kernel/locking/lockdep.c:5631 down_read+0x98/0x450 kernel/locking/rwsem.c:1499 mmap_read_lock include/linux/mmap_lock.h:117 [inline] binder_alloc_new_buf_locked drivers/android/binder_alloc.c:405 [inline] binder_alloc_new_buf+0xa5/0x19e0 drivers/android/binder_alloc.c:593 binder_transaction+0x242e/0x9a80 drivers/android/binder.c:3199 binder_thread_write+0x664/0x3220 drivers/android/binder.c:3986 binder_ioctl_write_read drivers/android/binder.c:5036 [inline] binder_ioctl+0x3470/0x6d00 drivers/android/binder.c:5323 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:870 [inline] __se_sys_ioctl fs/ioctl.c:856 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:856 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd [...] ==================================================================Fix these issues by setting up
alloc->vma_vm_mmpointer duringopen()and caching directly fromcurrent->mm. This guarantees we have a valid reference to take themmap_lockduring scenarios described above.[1] https://syzkaller.appspot.com/bug?extid=f7dc54e5be28950ac459
[2] https://syzkaller.appspot.com/bug?extid=a75ebe0452711c9e56d9
Quoted 6 lines
Fixes 44e602b4e52f ("binder_alloc: add missing mmap_lock calls when using the VMA")Reported-by [email protected]Reported-by [email protected]Cc <[email protected]> # v5.15+Cc Liam R. Howlett <[email protected]>Signed-off-by Carlos Llamas <[email protected]>
Quoted 39 lines
--- drivers/android/binder_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/android/binder_alloc.c +2
-3@@ -322,7 +322,6 @@ static inline void binder_alloc_set_vma(struct binder_alloc *alloc,*/ 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);@@ -795,7 +794,6 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc,binder_insert_free_buffer (alloc, buffer); alloc->free_async_space = alloc->buffer_size /2 ;binder_alloc_set_vma (alloc, vma); -mmgrab (alloc->vma_vm_mm);return 0 ;@@ -1091,6 +1089,8 @@ static struct shrinker binder_shrinker = {void binder_alloc_init (struct binder_alloc *alloc) { alloc->pid = current->group_leader->pid; + alloc->vma_vm_mm = current->mm; +mmgrab (alloc->vma_vm_mm);mutex_init (&alloc->mutex);INIT_LIST_HEAD (&alloc->buffers); } --2.37.2.672.g94769d06f0-goog
--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
Carlos Llamas
maintainerPATCH 2/7 binder: fix trivial kernel-doc typo
In reply to Carlos LlamasCorrect the misspelling of 'invariant' in kernel-doc section.
No functional changes in this patch.
--- drivers/android/binder_alloc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/android/binder_alloc.h +2 -2
@@ -75,10 +75,10 @@ struct binder_lru_page {/** * struct binder_alloc - per-binder proc state for binder allocator * @vma: vm_area_struct passed to mmap_handler -* (invarient after mmap) +* (invariant after mmap) * @tsk: tid for task that called init for this proc * (invariant after init) -* @vma_vm_mm: copy of vma->vm_mm (invarient after mmap) +* @vma_vm_mm: copy of vma->vm_mm (invariant after mmap) * @buffer: base of per-proc address space mapped via mmap * @buffers: list of all buffers for this proc * @free_buffers: rb tree of buffers available for allocation
Signature · 1 line
2.37.2.672.g94769d06f0-goog
Re: [PATCH 2/7] binder: fix trivial kernel-doc typo
Quoted 6 lines · Carlos Llamas
Correct the misspelling of 'invariant' in kernel-doc section.
No functional changes in this patch.
Signed-off-by Carlos Llamas <[email protected]>---
Looks good,
Re: [PATCH 2/7] binder: fix trivial kernel-doc typo
In reply to Carlos LlamasQuoted 6 lines · Carlos Llamas' via kernel-team
Correct the misspelling of 'invariant' in kernel-doc section.
No functional changes in this patch.
Signed-off-by Carlos Llamas <[email protected]>
Quoted 27 lines
--- drivers/android/binder_alloc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/android/binder_alloc.h +2
-3@@ -75,10 +75,10 @@ struct binder_lru_page {/** * struct binder_alloc - per-binder proc state for binder allocator * @vma: vm_area_struct passed to mmap_handler -* (invarient after mmap) +* (invariant after mmap) * @tsk: tid for task that called init for this proc * (invariant after init) -* @vma_vm_mm: copy of vma->vm_mm (invarient after mmap) +* @vma_vm_mm: copy of vma->vm_mm (invariant after mmap) * @buffer: base of per-proc address space mapped via mmap * @buffers: list of all buffers for this proc * @free_buffers: rb tree of buffers available for allocation -- 2.37.2.672.g94769d06f0-goog
--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
Carlos Llamas
maintainerPATCH 3/7 binder: rename alloc->vma_vm_mm to alloc->mm
In reply to Carlos LlamasRename ->vma_vm_mm to ->mm to reflect the fact that we no longer cache this reference from vma->vm_mm but from current->mm instead.
No functional changes in this patch.
--- drivers/android/binder_alloc.c | 34 +++++++++++++++++----------------- drivers/android/binder_alloc.h | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-)
drivers/android/binder_alloc.c +17 -17
@@ -208,8 +208,8 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate, } } -if (need_mm &&mmget_not_zero (alloc->vma_vm_mm)) - mm = alloc->vma_vm_mm; +if (need_mm &&mmget_not_zero (alloc->mm)) + mm = alloc->mm;if (mm) {mmap_read_lock (mm);
@@ -322,9 +322,9 @@ static inline void binder_alloc_set_vma(struct binder_alloc *alloc,*/ if (vma) { vm_start = vma->vm_start; -mmap_assert_write_locked (alloc->vma_vm_mm); +mmap_assert_write_locked (alloc->mm); }else { -mmap_assert_locked (alloc->vma_vm_mm); +mmap_assert_locked (alloc->mm); } alloc->vma_addr = vm_start;
@@ -336,7 +336,7 @@ static inline struct vm_area_struct *binder_alloc_get_vma(struct vm_area_struct *vma =NULL ;if (alloc->vma_addr) - vma =vma_lookup (alloc->vma_vm_mm, alloc->vma_addr); + vma =vma_lookup (alloc->mm, alloc->vma_addr);return vma; }
@@ -401,15 +401,15 @@ static struct binder_buffer *binder_alloc_new_buf_locked(size_t size, data_offsets_size;int ret; -mmap_read_lock (alloc->vma_vm_mm); +mmap_read_lock (alloc->mm);if (!binder_alloc_get_vma (alloc)) { -mmap_read_unlock (alloc->vma_vm_mm); +mmap_read_unlock (alloc->mm);binder_alloc_debug (BINDER_DEBUG_USER_ERROR ,"%d: binder_alloc_buf, no vma\n" , alloc->pid);return ERR_PTR (-ESRCH ); } -mmap_read_unlock (alloc->vma_vm_mm); +mmap_read_unlock (alloc->mm); data_offsets_size =ALIGN (data_size,sizeof (void *)) +ALIGN (offsets_size,sizeof (void *));
@@ -823,7 +823,7 @@ void binder_alloc_deferred_release(struct binder_alloc *alloc) buffers =0 ;mutex_lock (&alloc->mutex);BUG_ON (alloc->vma_addr && -vma_lookup (alloc->vma_vm_mm, alloc->vma_addr)); +vma_lookup (alloc->mm, alloc->vma_addr));while ((n =rb_first (&alloc->allocated_buffers))) { buffer = rb_entry(n, struct binder_buffer, rb_node);
@@ -873,8 +873,8 @@ void binder_alloc_deferred_release(struct binder_alloc *alloc)kfree (alloc->pages); }mutex_unlock (&alloc->mutex); -if (alloc->vma_vm_mm) -mmdrop (alloc->vma_vm_mm); +if (alloc->mm) +mmdrop (alloc->mm); binder_alloc_debug(BINDER_DEBUG_OPEN_CLOSE, "%s: %d buffers %d, pages %d\n",
@@ -931,13 +931,13 @@ void binder_alloc_print_pages(struct seq_file *m,* read inconsistent state. */ -mmap_read_lock (alloc->vma_vm_mm); +mmap_read_lock (alloc->mm);if (binder_alloc_get_vma (alloc) ==NULL ) { -mmap_read_unlock (alloc->vma_vm_mm); +mmap_read_unlock (alloc->mm); goto uninitialized; } -mmap_read_unlock (alloc->vma_vm_mm); +mmap_read_unlock (alloc->mm);for (i =0 ; i < alloc->buffer_size /PAGE_SIZE ; i++) { page = &alloc->pages[i];if (!page->page_ptr)
@@ -1020,7 +1020,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item, index = page - alloc->pages; page_addr = (uintptr_t )alloc->buffer + index *PAGE_SIZE ; - mm = alloc->vma_vm_mm; + mm = alloc->mm;if (!mmget_not_zero (mm)) goto err_mmget;if (!mmap_read_trylock (mm))
@@ -1089,8 +1089,8 @@ static struct shrinker binder_shrinker = {void binder_alloc_init (struct binder_alloc *alloc) { alloc->pid = current->group_leader->pid; - alloc->vma_vm_mm = current->mm; -mmgrab (alloc->vma_vm_mm); + alloc->mm = current->mm; +mmgrab (alloc->mm);mutex_init (&alloc->mutex);INIT_LIST_HEAD (&alloc->buffers); }
drivers/android/binder_alloc.h +2 -2
@@ -78,7 +78,7 @@ struct binder_lru_page {* (invariant after mmap) * @tsk: tid for task that called init for this proc * (invariant after init) -* @vma_vm_mm: copy of vma->vm_mm (invariant after mmap) +* @mm: copy of task->mm (invariant after open) * @buffer: base of per-proc address space mapped via mmap * @buffers: list of all buffers for this proc * @free_buffers: rb tree of buffers available for allocation
@@ -101,7 +101,7 @@ struct binder_lru_page {struct binder_alloc {struct mutex mutex;unsigned long vma_addr; -struct mm_struct *vma_vm_mm; +struct mm_struct *mm;void __user *buffer;struct list_head buffers;struct rb_root free_buffers;
Signature · 1 line
2.37.2.672.g94769d06f0-goog
Re: [PATCH 3/7] binder: rename alloc->vma_vm_mm to alloc->mm
Quoted 7 lines · Carlos Llamas
Rename ->vma_vm_mm to ->mm to reflect the fact that we no longer cache this reference from
vma->vm_mmbut fromcurrent->mminstead.No functional changes in this patch.
Signed-off-by Carlos Llamas <[email protected]>---
Looks good,
Re: [PATCH 3/7] binder: rename alloc->vma_vm_mm to alloc->mm
In reply to Carlos LlamasQuoted 7 lines · Carlos Llamas' via kernel-team
Rename ->vma_vm_mm to ->mm to reflect the fact that we no longer cache this reference from
vma->vm_mmbut fromcurrent->mminstead.No functional changes in this patch.
Signed-off-by Carlos Llamas <[email protected]>
Quoted 145 lines
--- drivers/android/binder_alloc.c | 34 +++++++++++++++++----------------- drivers/android/binder_alloc.h | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-)drivers/android/binder_alloc.c +17
-17@@ -208,8 +208,8 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate, } } -if (need_mm &&mmget_not_zero (alloc->vma_vm_mm)) - mm = alloc->vma_vm_mm; +if (need_mm &&mmget_not_zero (alloc->mm)) + mm = alloc->mm;if (mm) {mmap_read_lock (mm);@@ -322,9 +322,9 @@ static inline void binder_alloc_set_vma(struct binder_alloc *alloc,*/ if (vma) { vm_start = vma->vm_start; -mmap_assert_write_locked (alloc->vma_vm_mm); +mmap_assert_write_locked (alloc->mm); }else { -mmap_assert_locked (alloc->vma_vm_mm); +mmap_assert_locked (alloc->mm); } alloc->vma_addr = vm_start;@@ -336,7 +336,7 @@ static inline struct vm_area_struct *binder_alloc_get_vma(struct vm_area_struct *vma =NULL ;if (alloc->vma_addr) - vma =vma_lookup (alloc->vma_vm_mm, alloc->vma_addr); + vma =vma_lookup (alloc->mm, alloc->vma_addr);return vma; }@@ -401,15 +401,15 @@ static struct binder_buffer *binder_alloc_new_buf_locked(size_t size, data_offsets_size;int ret; -mmap_read_lock (alloc->vma_vm_mm); +mmap_read_lock (alloc->mm);if (!binder_alloc_get_vma (alloc)) { -mmap_read_unlock (alloc->vma_vm_mm); +mmap_read_unlock (alloc->mm);binder_alloc_debug (BINDER_DEBUG_USER_ERROR ,"%d: binder_alloc_buf, no vma\n" , alloc->pid);return ERR_PTR (-ESRCH ); } -mmap_read_unlock (alloc->vma_vm_mm); +mmap_read_unlock (alloc->mm); data_offsets_size =ALIGN (data_size,sizeof (void *)) +ALIGN (offsets_size,sizeof (void *));@@ -823,7 +823,7 @@ void binder_alloc_deferred_release(struct binder_alloc *alloc) buffers =0 ;mutex_lock (&alloc->mutex);BUG_ON (alloc->vma_addr && -vma_lookup (alloc->vma_vm_mm, alloc->vma_addr)); +vma_lookup (alloc->mm, alloc->vma_addr));while ((n =rb_first (&alloc->allocated_buffers))) { buffer = rb_entry(n, struct binder_buffer, rb_node);@@ -873,8 +873,8 @@ void binder_alloc_deferred_release(struct binder_alloc *alloc)kfree (alloc->pages); }mutex_unlock (&alloc->mutex); -if (alloc->vma_vm_mm) -mmdrop (alloc->vma_vm_mm); +if (alloc->mm) +mmdrop (alloc->mm); binder_alloc_debug(BINDER_DEBUG_OPEN_CLOSE, "%s: %d buffers %d, pages %d\n",@@ -931,13 +931,13 @@ void binder_alloc_print_pages(struct seq_file *m,* read inconsistent state. */ -mmap_read_lock (alloc->vma_vm_mm); +mmap_read_lock (alloc->mm);if (binder_alloc_get_vma (alloc) ==NULL ) { -mmap_read_unlock (alloc->vma_vm_mm); +mmap_read_unlock (alloc->mm); goto uninitialized; } -mmap_read_unlock (alloc->vma_vm_mm); +mmap_read_unlock (alloc->mm);for (i =0 ; i < alloc->buffer_size /PAGE_SIZE ; i++) { page = &alloc->pages[i];if (!page->page_ptr)@@ -1020,7 +1020,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item, index = page - alloc->pages; page_addr = (uintptr_t )alloc->buffer + index *PAGE_SIZE ; - mm = alloc->vma_vm_mm; + mm = alloc->mm;if (!mmget_not_zero (mm)) goto err_mmget;if (!mmap_read_trylock (mm))@@ -1089,8 +1089,8 @@ static struct shrinker binder_shrinker = {void binder_alloc_init (struct binder_alloc *alloc) { alloc->pid = current->group_leader->pid; - alloc->vma_vm_mm = current->mm; -mmgrab (alloc->vma_vm_mm); + alloc->mm = current->mm; +mmgrab (alloc->mm);mutex_init (&alloc->mutex);INIT_LIST_HEAD (&alloc->buffers); }drivers/android/binder_alloc.h +2
-3@@ -78,7 +78,7 @@ struct binder_lru_page {* (invariant after mmap) * @tsk: tid for task that called init for this proc * (invariant after init) -* @vma_vm_mm: copy of vma->vm_mm (invariant after mmap) +* @mm: copy of task->mm (invariant after open) * @buffer: base of per-proc address space mapped via mmap * @buffers: list of all buffers for this proc * @free_buffers: rb tree of buffers available for allocation @@ -101,7 +101,7 @@ struct binder_lru_page {struct binder_alloc {struct mutex mutex;unsigned long vma_addr; -struct mm_struct *vma_vm_mm; +struct mm_struct *mm;void __user *buffer;struct list_head buffers;struct rb_root free_buffers; --2.37.2.672.g94769d06f0-goog
--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
Carlos Llamas
maintainerPATCH 4/7 binder: remove binder_alloc_set_vma()
In reply to Carlos LlamasThe mmap_locked asserts here are not needed since this is only called back from the mmap stack in ->mmap() and ->close() which always acquire the lock first. Remove these asserts along with binder_alloc_set_vma() altogether since it's trivial enough to be consumed by callers.
--- drivers/android/binder_alloc.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)
drivers/android/binder_alloc.c +2 -23
@@ -309,27 +309,6 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate,return vma ? -ENOMEM : -ESRCH ; } - -static inline void binder_alloc_set_vma (struct binder_alloc *alloc, -struct vm_area_struct *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; -mmap_assert_write_locked (alloc->mm); - }else { -mmap_assert_locked (alloc->mm); - } - - alloc->vma_addr = vm_start; -} -static inline struct vm_area_struct *binder_alloc_get_vma (struct binder_alloc *alloc) {
@@ -793,7 +772,7 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc, buffer->free =1 ;binder_insert_free_buffer (alloc, buffer); alloc->free_async_space = alloc->buffer_size /2 ; -binder_alloc_set_vma (alloc, vma); + alloc->vma_addr = vma->vm_start;return 0 ;
@@ -983,7 +962,7 @@ int binder_alloc_get_allocated_count(struct binder_alloc *alloc)*/ void binder_alloc_vma_close (struct binder_alloc *alloc) { -binder_alloc_set_vma (alloc,NULL ); + alloc->vma_addr =0 ; }/**
Signature · 1 line
2.37.2.672.g94769d06f0-goog
Re: [PATCH 4/7] binder: remove binder_alloc_set_vma()
Quoted 4 lines · Carlos Llamas
The
mmap_lockedasserts here are not needed since this is only called back from the mmap stack in ->mmap() and ->close() which always acquire the lock first. Remove these asserts along withbinder_alloc_set_vma()altogether since it's trivial enough to be consumed by callers.
I agree that it is not called anywhere else today. I think it's still worth while since these asserts do nothing if you don't build with lockdep and/or debug_vm enabled. I was hoping having these here would avoid future mistakes a lot like what we have in the mm code's find_vma() (mm/mmap.c ~L2297).
Quoted 60 lines
Cc Liam R. Howlett <[email protected]>Signed-off-by Carlos Llamas <[email protected]>--- drivers/android/binder_alloc.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-)drivers/android/binder_alloc.c +2
-23@@ -309,27 +309,6 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate,return vma ? -ENOMEM : -ESRCH ; } - -static inline void binder_alloc_set_vma (struct binder_alloc *alloc, -struct vm_area_struct *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; -mmap_assert_write_locked (alloc->mm); - }else { -mmap_assert_locked (alloc->mm); - } - - alloc->vma_addr = vm_start; -} -static inline struct vm_area_struct *binder_alloc_get_vma (struct binder_alloc *alloc) {@@ -793,7 +772,7 @@ int binder_alloc_mmap_handler(struct binder_alloc *alloc, buffer->free =1 ;binder_insert_free_buffer (alloc, buffer); alloc->free_async_space = alloc->buffer_size /2 ; -binder_alloc_set_vma (alloc, vma); + alloc->vma_addr = vma->vm_start;return 0 ;@@ -983,7 +962,7 @@ int binder_alloc_get_allocated_count(struct binder_alloc *alloc)*/ void binder_alloc_vma_close (struct binder_alloc *alloc) { -binder_alloc_set_vma (alloc,NULL ); + alloc->vma_addr =0 ; }/** Signature · 1 line
2.37.2.672.g94769d06f0-goog
Carlos Llamas
maintainerRe: [PATCH 4/7] binder: remove binder_alloc_set_vma()
Quoted 6 lines · Liam Howlett
Quoted 4 lines · Carlos Llamas
The
mmap_lockedasserts here are not needed since this is only called back from the mmap stack in ->mmap() and ->close() which always acquire the lock first. Remove these asserts along withbinder_alloc_set_vma()altogether since it's trivial enough to be consumed by callers.
Quoted 6 lines
I agree that it is not called anywhere else today. I think it's still worth while since these asserts do nothing if you don't build with lockdep and/or
debug_vmenabled. I was hoping having these here would avoid future mistakes a lot like what we have in the mm code'sfind_vma()(mm/mmap.c~L2297).
Yes, the assert in find_vma() is perfectly fine, we need to check that callers have taken the lock before looking up a vma. However, the scenario here is different as these are callbacks for vm_ops->close() and mmap() so we are guaranteed to have the lock at this point. We don't really want to duplicate checks for each user of these callbacks such as the binder driver here.
Carlos Llamas
maintainerPATCH 5/7 binder: remove unused binder_alloc->buffer_free
In reply to Carlos LlamasThe ->buffer_free member was introduced in the first revision of the driver under staging but it appears like it was never actually used according to git's history. Remove it from binder_alloc.
--- drivers/android/binder_alloc.h | 1 - 1 file changed, 1 deletion(-)
drivers/android/binder_alloc.h +0 -1
@@ -109,7 +109,6 @@ struct binder_alloc {size_t free_async_space;struct binder_lru_page *pages;size_t buffer_size; -uint32_t buffer_free;int pid;size_t pages_high;bool oneway_spam_detected;
Signature · 1 line
2.37.2.672.g94769d06f0-goog
Re: [PATCH 5/7] binder: remove unused binder_alloc->buffer_free
Quoted 6 lines · Carlos Llamas
The ->buffer_free member was introduced in the first revision of the driver under staging but it appears like it was never actually used according to git's history. Remove it from
binder_alloc.Signed-off-by Carlos Llamas <[email protected]>---
Looks good,
Re: [PATCH 5/7] binder: remove unused binder_alloc->buffer_free
In reply to Carlos LlamasQuoted 6 lines · Carlos Llamas' via kernel-team
The ->buffer_free member was introduced in the first revision of the driver under staging but it appears like it was never actually used according to git's history. Remove it from
binder_alloc.Signed-off-by Carlos Llamas <[email protected]>
Quoted 22 lines
--- drivers/android/binder_alloc.h | 1 - 1 file changed, 1 deletion(-)drivers/android/binder_alloc.h +0
-2@@ -109,7 +109,6 @@ struct binder_alloc {size_t free_async_space;struct binder_lru_page *pages;size_t buffer_size; -uint32_t buffer_free;int pid;size_t pages_high;bool oneway_spam_detected; --2.37.2.672.g94769d06f0-goog
--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
Carlos Llamas
maintainerPATCH 6/7 binder: fix binder_alloc kernel-doc warnings
In reply to Carlos LlamasUpdate the kernel-doc section of struct binder_alloc to fix the following warnings reported by ./scripts/kernel-doc:
warning: Function parameter or member 'mutex' not described in 'binder_alloc'
warning: Function parameter or member 'vma_addr' not described in 'binder_alloc'
No functional changes in this patch.
--- drivers/android/binder_alloc.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/android/binder_alloc.h +2 -3
@@ -74,10 +74,9 @@ struct binder_lru_page {/** * struct binder_alloc - per-binder proc state for binder allocator -* @vma: vm_area_struct passed to mmap_handler +* @mutex: protects binder_alloc fields +* @vma_addr: vm_area_struct->vm_start passed to mmap_handler * (invariant after mmap) -* @tsk: tid for task that called init for this proc -* (invariant after init) * @mm: copy of task->mm (invariant after open) * @buffer: base of per-proc address space mapped via mmap * @buffers: list of all buffers for this proc
Signature · 1 line
2.37.2.672.g94769d06f0-goog
Re: [PATCH 6/7] binder: fix binder_alloc kernel-doc warnings
Quoted 10 lines · Carlos Llamas
Update the kernel-doc section of struct
binder_allocto fix the following warnings reported by./scripts/kernel-doc:warning: Function parameter or member 'mutex' not described in '
binder_alloc'
warning: Function parameter or member 'vma_addr' not described in 'binder_alloc'No functional changes in this patch.
Signed-off-by Carlos Llamas <[email protected]>---
Looks good,
Re: [PATCH 6/7] binder: fix binder_alloc kernel-doc warnings
In reply to Carlos LlamasQuoted 10 lines · Carlos Llamas' via kernel-team
Update the kernel-doc section of struct
binder_allocto fix the following warnings reported by./scripts/kernel-doc:warning: Function parameter or member 'mutex' not described in '
binder_alloc'
warning: Function parameter or member 'vma_addr' not described in 'binder_alloc'No functional changes in this patch.
Signed-off-by Carlos Llamas <[email protected]>
Quoted 27 lines
--- drivers/android/binder_alloc.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/android/binder_alloc.h +2
-4@@ -74,10 +74,9 @@ struct binder_lru_page {/** * struct binder_alloc - per-binder proc state for binder allocator -* @vma: vm_area_struct passed to mmap_handler +* @mutex: protects binder_alloc fields +* @vma_addr: vm_area_struct->vm_start passed to mmap_handler * (invariant after mmap) -* @tsk: tid for task that called init for this proc -* (invariant after init) * @mm: copy of task->mm (invariant after open) * @buffer: base of per-proc address space mapped via mmap * @buffers: list of all buffers for this proc -- 2.37.2.672.g94769d06f0-goog
--
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
Carlos Llamas
maintainerPATCH 7/7 binderfs: remove unused INTSTRLEN macro
In reply to Carlos LlamasFix the following W=1 build error:
drivers/android/binderfs.c:42: error: macro "INTSTRLEN" is not used [-Werror=unused-macros]
42 | #define INTSTRLEN 21
|
No functional changes in this patch.
--- drivers/android/binderfs.c | 1 - 1 file changed, 1 deletion(-)
drivers/android/binderfs.c +0 -1
@@ -39,7 +39,6 @@#define FIRST_INODE 1#define SECOND_INODE 2#define INODE_OFFSET 3 -#define INTSTRLEN 21#define BINDERFS_MAX_MINOR (1U << MINORBITS)/* Ensure that the initial ipc namespace always has devices available. */ #define BINDERFS_MAX_MINOR_CAPPED (BINDERFS_MAX_MINOR - 4)
Signature · 1 line
2.37.2.672.g94769d06f0-goog
Re: [PATCH 7/7] binderfs: remove unused INTSTRLEN macro
Quoted 10 lines · Carlos Llamas
Fix the following W=1 build error:
drivers/android/binderfs.c:42: error: macro "INTSTRLEN" is not used [-Werror=unused-macros]
42 | #define INTSTRLEN 21|No functional changes in this patch.
Signed-off-by Carlos Llamas <[email protected]>---
Thanks,
Greg Kroah-Hartman
maintainerQuoted 4 lines · Carlos Llamas
This patch series fixes primarily a null dereference of
alloc->vma_vm_mmreported by syzbot which unfortunately is quite easy to reproduce. Also, included here are several other patches for more trivial things I found along the way.
Because you had 1 bugfix, and 6 "normal" patches, I had to split this up across branches. Which caused some of the normal patches to fail to apply :(
Please wait until 6.0-rc5 or so is out with the fix patch merged and then rebase the remaining against my char-misc-next branch and resend them.
thanks,
greg k-h