Received: by 2002:a05:6358:bb9e:b0:b9:5105:a5b4 with SMTP id df30csp4525393rwb; Tue, 6 Sep 2022 08:41:40 -0700 (PDT) X-Google-Smtp-Source: AA6agR6dsDO5irvgWjCmuadzRG3ezMvOEL+w5oFpKlDs7469xPIUdcQCb/kTP5OWfTq2QwVo2fLX X-Received: by 2002:a17:902:7796:b0:172:c716:d3ac with SMTP id o22-20020a170902779600b00172c716d3acmr54061358pll.137.1662478900386; Tue, 06 Sep 2022 08:41:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662478900; cv=none; d=google.com; s=arc-20160816; b=rxLr4wJpEN6HuZpU//QLy0GzlLlnHvUim6zBw9OJ7GsZGqULAdH2FRAmO6L2Lkq5e3 V50OuEZXYEKKkmOF7gUWuKV7EfaNu9YjhQR3jGfc7nsUWgY2bTzF/3iDHk1+I2AAck0Y Xd1jdEE1LhsUjtO6pkKZXPWXnXdMODeXRdP7Dh4oN26Py5GaVU8WLft8RHq2CbwYUq7V Ub8EmbLMVTKjZe418XSPU20sWSSGtbyMWXR8lqhthf9BYnkdsgXp0uSKkFy40gSzUxeV H1Ivxt9sahXufK3pJpl1JU5539t90hAsxYhGWAnxwb2C8ZKslhjhrrzBQobLkXIz4E3j TgBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YCsm7dSMf9MiqQTveunKRuG7uGpYGt5oz49feevzhk0=; b=lmlrVvq+h7zVFK314a0nwkfbv3vbhhpcQ/l2ErwzVla1pvJr3ytwUS/twXZP5wqbxW HzFxx2ip5yqbVI6xVwIWMZhc3SIbr87vtbkRcOqmfCbBbPqXPpQWLgB4tuWUL8kqfEHu iKaq3RwFxCag7h5MjoLeDmCvhKiCNQXD9bbKe/0f6OzKoUmp399dAynQySM5ZEbk801+ c/7pN0NYP/kxN9Nv0lLiw43xV92Vqxf9SZ7ZPwLINLm40D0uJg227B+oH+hlVwpoCdd4 pNHDqvIFC/PSU0td473Na+JPDo+CTBTg1Ji//thcCruAUGOWaqAuxM9HJeyRbX50vuBu A0lA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yAkque8y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q5-20020a056a00150500b0052dd8b9fe49si14216527pfu.182.2022.09.06.08.41.28; Tue, 06 Sep 2022 08:41:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yAkque8y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241175AbiIFOLz (ORCPT + 99 others); Tue, 6 Sep 2022 10:11:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241430AbiIFOJp (ORCPT ); Tue, 6 Sep 2022 10:09:45 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3349986C35; Tue, 6 Sep 2022 06:47:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1A1EAB818D2; Tue, 6 Sep 2022 13:45:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77371C433C1; Tue, 6 Sep 2022 13:45:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662471907; bh=Cz0CHVarmca+G5srHAtV+3h5RHSM85tr9CJWf5yphv8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yAkque8yu10sBaP7KvF4OchiT4C0NpXmGpWekvQoZ0Vy342jQ3Rj2BrrVQ4FJEh2H M23a5zRz/hHjVSyFLRJpMttXNI6/8uRxENsOElxzi5yo+nMAabDzozknUMtOdX8E1o S/lu6KnTucVpbJk6/scBKUQ+2N4/1wxjmelH7Cao= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Liam R. Howlett" , syzbot+f7dc54e5be28950ac459@syzkaller.appspotmail.com, syzbot+a75ebe0452711c9e56d9@syzkaller.appspotmail.com, Todd Kjos , Carlos Llamas Subject: [PATCH 5.19 081/155] binder: fix alloc->vma_vm_mm null-ptr dereference Date: Tue, 6 Sep 2022 15:30:29 +0200 Message-Id: <20220906132832.856297084@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220906132829.417117002@linuxfoundation.org> References: <20220906132829.417117002@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Carlos Llamas commit 1da52815d5f1b654c89044db0cdc6adce43da1f1 upstream. 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: 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") Cc: # v5.15+ Cc: Liam R. Howlett Reported-by: syzbot+f7dc54e5be28950ac459@syzkaller.appspotmail.com Reported-by: syzbot+a75ebe0452711c9e56d9@syzkaller.appspotmail.com Reviewed-by: Liam R. Howlett Acked-by: Todd Kjos Signed-off-by: Carlos Llamas Link: https://lore.kernel.org/r/20220829201254.1814484-2-cmllamas@google.com Signed-off-by: Greg Kroah-Hartman --- drivers/android/binder_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -322,7 +322,6 @@ static inline void binder_alloc_set_vma( */ 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 bin 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); }