mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Liam Howlett <liam.howlett@oracle.com>
To: Carlos Llamas <cmllamas@google.com>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Arve Hjønnevåg" <arve@android.com>,
	"Todd Kjos" <tkjos@android.com>,
	"Martijn Coenen" <maco@android.com>,
	"Joel Fernandes" <joel@joelfernandes.org>,
	"Christian Brauner" <brauner@kernel.org>,
	"Suren Baghdasaryan" <surenb@google.com>,
	"Andrew Morton" <akpm@linux-foundation.org>,
	"kernel-team@android.com" <kernel-team@android.com>,
	"syzbot+f7dc54e5be28950ac459@syzkaller.appspotmail.com"
	<syzbot+f7dc54e5be28950ac459@syzkaller.appspotmail.com>,
	"syzbot+a75ebe0452711c9e56d9@syzkaller.appspotmail.com"
	<syzbot+a75ebe0452711c9e56d9@syzkaller.appspotmail.com>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/7] binder: fix alloc->vma_vm_mm null-ptr dereference
Date: Tue, 30 Aug 2022 19:06:37 +0000	[thread overview]
Message-ID: <20220830190515.dlrp2a3ypfyhzid5@revolver> (raw)
In-Reply-To: <20220829201254.1814484-2-cmllamas@google.com>

* Carlos Llamas <cmllamas@google.com> [220829 16:13]:
> 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
> 
> Fixes: 44e602b4e52f ("binder_alloc: add missing mmap_lock calls when using the VMA")
> Reported-by: syzbot+f7dc54e5be28950ac459@syzkaller.appspotmail.com
> Reported-by: syzbot+a75ebe0452711c9e56d9@syzkaller.appspotmail.com
> Cc: <stable@vger.kernel.org> # v5.15+
> Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
> Signed-off-by: Carlos Llamas <cmllamas@google.com>
> ---
>  drivers/android/binder_alloc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
> index 51f4e1c5cd01..9b1778c00610 100644
> --- a/drivers/android/binder_alloc.c
> +++ b/drivers/android/binder_alloc.c
> @@ -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..?

>  		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
> 

  parent reply	other threads:[~2022-08-30 19:06 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-29 20:12 [PATCH 0/7] fix null-ptr-deref in binder_alloc and others Carlos Llamas
2022-08-29 20:12 ` [PATCH 1/7] binder: fix alloc->vma_vm_mm null-ptr dereference Carlos Llamas
2022-08-29 20:34   ` Andrew Morton
2022-08-29 21:20     ` Carlos Llamas
2022-08-30 19:06   ` Liam Howlett [this message]
2022-08-30 19:40     ` Carlos Llamas
2022-08-30 20:30       ` Liam Howlett
2022-08-30 22:26   ` Todd Kjos
2022-08-29 20:12 ` [PATCH 2/7] binder: fix trivial kernel-doc typo Carlos Llamas
2022-08-30  7:53   ` Christian Brauner
2022-08-30 22:20   ` Todd Kjos
2022-08-29 20:12 ` [PATCH 3/7] binder: rename alloc->vma_vm_mm to alloc->mm Carlos Llamas
2022-08-30  7:56   ` Christian Brauner
2022-08-30 22:20   ` Todd Kjos
2022-08-29 20:12 ` [PATCH 4/7] binder: remove binder_alloc_set_vma() Carlos Llamas
2022-08-30 18:57   ` Liam Howlett
2022-08-30 21:08     ` Carlos Llamas
2022-08-29 20:12 ` [PATCH 5/7] binder: remove unused binder_alloc->buffer_free Carlos Llamas
2022-08-30  7:57   ` Christian Brauner
2022-08-30 22:21   ` Todd Kjos
2022-08-29 20:12 ` [PATCH 6/7] binder: fix binder_alloc kernel-doc warnings Carlos Llamas
2022-08-30  7:53   ` Christian Brauner
2022-08-30 22:22   ` Todd Kjos
2022-08-29 20:12 ` [PATCH 7/7] binderfs: remove unused INTSTRLEN macro Carlos Llamas
2022-08-30  7:53   ` Christian Brauner
2022-09-01 14:18 ` [PATCH 0/7] fix null-ptr-deref in binder_alloc and others Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220830190515.dlrp2a3ypfyhzid5@revolver \
    --to=liam.howlett@oracle.com \
    --cc=akpm@linux-foundation.org \
    --cc=arve@android.com \
    --cc=brauner@kernel.org \
    --cc=cmllamas@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=joel@joelfernandes.org \
    --cc=kernel-team@android.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maco@android.com \
    --cc=stable@vger.kernel.org \
    --cc=surenb@google.com \
    --cc=syzbot+a75ebe0452711c9e56d9@syzkaller.appspotmail.com \
    --cc=syzbot+f7dc54e5be28950ac459@syzkaller.appspotmail.com \
    --cc=tkjos@android.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®