From nobody Tue Apr 7 09:05:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E207ECAAD2 for ; Mon, 29 Aug 2022 20:13:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230107AbiH2UNI (ORCPT ); Mon, 29 Aug 2022 16:13:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230095AbiH2UNC (ORCPT ); Mon, 29 Aug 2022 16:13:02 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 995B17677D for ; Mon, 29 Aug 2022 13:13:00 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id m5-20020a170902f64500b0016d313f3ce7so6782522plg.23 for ; Mon, 29 Aug 2022 13:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc; bh=3+KFGw/lw7UFTEKp2QYuhuNuaZRNkMlHXcRjkBPuoco=; b=KkqpTJCgR/OwOt0P10HqU41mOPMq7h05KJQ8hIf3ml9CTTVyKhnxqp/+m8DAOkaCY2 43sG7c898K8zn+G43oaYsEliwtvpg+P4fnkAoEiUqx5BgZ9x6ISVBEZBicoAQCPk0H8r DUDcNwOUbmUkYWavjrhf9jBWCM9uOv2pswrNF2bzpzJ+g83AY2GcZbl57oxt71J+h1jk gAUt97QPDVsv18kwENFVt23VNLI0umUyhF1C5qkb4IWNczrHytbnOvDdETBPkrQOYWY6 VrDWWPk6yN7wnHoRlYEy85WySxqh8vxZwD3AakRc/hpFn952UZ3bLASzTcsjcAhzQD9O xH9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc; bh=3+KFGw/lw7UFTEKp2QYuhuNuaZRNkMlHXcRjkBPuoco=; b=6+/32Qbl1ign1d2IBD5S/KZyk+WTCpjt/Fl75vhTe5ucKiT5Z09OJjo6EpS8CTuFLQ 8w7h4TIlmCp0ShBs6/clHM+MCSPXPuk0U3+cxCIyca5JnHWPS8i0PHWFKbeV5DnZ5xQq X2nPMF3OxdrFFG+kOuZQ/+a+5GVYSxDdiLpN4OvFQljWA5G4GZ3F103PZqTkJu8bWZXf jcFaIRI9EjtTIZ70e53OEhEsfRSfhC4OFyxW/Po4lYUD+YNef88fMrAcn6+ncrVUX7wP 4jh3EEU3WuceyZiZTEqxwb0kEn2HtveGQiJmlE7K6piIpw0x4K4kc6GyaL+/WtcUqI46 I+6w== X-Gm-Message-State: ACgBeo2elnkMffVgWTvvwN388kEQ58O7fYxbLMvJhuv1Y1OXO6fXUyG/ 29hQYuMXUXuKoXcuFv9kSkmCFYR+kfd7iA== X-Google-Smtp-Source: AA6agR7q6tV50augbDBj5FI+PYqaTZLRyKhIvbXKaLDo74MAo4aCJqE/LL9Fp9trQj2FgsIlB5oC5YO5eTaJOA== X-Received: from xllamas.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5070]) (user=cmllamas job=sendgmr) by 2002:a17:90b:3e8a:b0:1fb:27a0:c39b with SMTP id rj10-20020a17090b3e8a00b001fb27a0c39bmr20500444pjb.155.1661803979977; Mon, 29 Aug 2022 13:12:59 -0700 (PDT) Date: Mon, 29 Aug 2022 20:12:48 +0000 In-Reply-To: <20220829201254.1814484-1-cmllamas@google.com> Mime-Version: 1.0 References: <20220829201254.1814484-1-cmllamas@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220829201254.1814484-2-cmllamas@google.com> Subject: [PATCH 1/7] binder: fix alloc->vma_vm_mm null-ptr dereference From: Carlos Llamas To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Carlos Llamas , Suren Baghdasaryan , Andrew Morton , Liam Howlett Cc: kernel-team@android.com, syzbot+f7dc54e5be28950ac459@syzkaller.appspotmail.com, syzbot+a75ebe0452711c9e56d9@syzkaller.appspotmail.com, stable@vger.kernel.org, "Liam R . Howlett" , linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D KASAN: null-ptr-deref in range [0x0000000000000128-0x000000000000012f] CPU: 0 PID: 3755 Comm: syz-executor229 Not tainted 6.0.0-rc1-next-2022081= 9-syzkaller #0 syz-executor229[3755] cmdline: ./syz-executor2294415195 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS G= oogle 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 [...] =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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=3Df7dc54e5be28950ac459 [2] https://syzkaller.appspot.com/bug?extid=3Da75ebe0452711c9e56d9 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: # v5.15+ Cc: Liam R. Howlett Signed-off-by: Carlos Llamas Acked-by: Todd Kjos Reviewed-by: Liam R. Howlett --- 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_a= lloc *alloc, */ if (vma) { vm_start =3D vma->vm_start; - alloc->vma_vm_mm =3D 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 *allo= c, binder_insert_free_buffer(alloc, buffer); alloc->free_async_space =3D alloc->buffer_size / 2; binder_alloc_set_vma(alloc, vma); - mmgrab(alloc->vma_vm_mm); =20 return 0; =20 @@ -1091,6 +1089,8 @@ static struct shrinker binder_shrinker =3D { void binder_alloc_init(struct binder_alloc *alloc) { alloc->pid =3D current->group_leader->pid; + alloc->vma_vm_mm =3D current->mm; + mmgrab(alloc->vma_vm_mm); mutex_init(&alloc->mutex); INIT_LIST_HEAD(&alloc->buffers); } --=20 2.37.2.672.g94769d06f0-goog From nobody Tue Apr 7 09:05:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79EA3ECAAD4 for ; Mon, 29 Aug 2022 20:13:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230136AbiH2UNM (ORCPT ); Mon, 29 Aug 2022 16:13:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230096AbiH2UNE (ORCPT ); Mon, 29 Aug 2022 16:13:04 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F23498A51 for ; Mon, 29 Aug 2022 13:13:02 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id i25-20020a635859000000b0042bbb74be8bso2551804pgm.5 for ; Mon, 29 Aug 2022 13:13:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc; bh=c+V6ZZoSbyilAuCWrSUmpUH+8o9/Xyf5DRUIoUPm6XI=; b=th/mrIVRwJZnvQWDY6W+eVycuyURZk0Sl/DjLPmvcO2BzkGBlZiaYmgNMHCqciDIBC V7M8xdsyYeHngANpHKmlWYvdoHwzHDpr//zBG5r5kPHUUlXESeMRq4b24K5J7E2yCVoz SJN6h+D1T04ZqWqYO/TLu+tpQ9CtmIp5ja2b6jxhfvSXJNlbnqO5uvM8jgEokHoBB18R BQHQzBoVYIDu5NcHN3bYKiAnRjl1yRcPOT4HZLDwBK8rMPZflq/UENqZNFseuG9hZTQ8 5DzDl0s+12Qj4N9QzPk8rE/nuIn3Tz0f7w+C8XZmGCoK9cnQCtaMYnLQwg5e3KO6IyOo EmIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc; bh=c+V6ZZoSbyilAuCWrSUmpUH+8o9/Xyf5DRUIoUPm6XI=; b=Y76j4KihWbdsjT06bBC7awT3+dNPBE/BGY/wSjsfXcEpEdRp5bqgtTdi9HoZXso66X OgZQC0L46kLLve4xcqIJMTNf3B/AyNWcp5Mph47F2dF7vomQYpflLxCuczd5haOjHmtK yBDt92ldQbRhne0PhfiixaBgk12nWiDuGSFF/t5nIJlucyaOFcziR8HD1eVdRhJElmoT Xr8FwxjF6XZf51wq/9OS2foSBvNC0Um+bwQwGmRejxCG8NIoktW0jGmYekaq66YkCzEU aHJKpwntd60Im3JIe0SnXh35xxBHhuj+f36Pujn0n9/IJaBbtoav4SSh871yCqcLOBIv LrqQ== X-Gm-Message-State: ACgBeo0OKiMEmkKX83UgZJweP/BH19QeJVk0DeEiKwJL+x4BTmsg95CC aeBDoTUALtpa8d4hg6/Z0k9GnQMkUXmsvA== X-Google-Smtp-Source: AA6agR6256IN6UnhHmY7Mc33PGDMwJCHqWrhB3Iam39aDneViP7+0NCT5g95gwDa5PcKe+BSqZqdnVGMX0mbVg== X-Received: from xllamas.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5070]) (user=cmllamas job=sendgmr) by 2002:a17:90b:d81:b0:1fd:7fed:4a9c with SMTP id bg1-20020a17090b0d8100b001fd7fed4a9cmr14793656pjb.127.1661803982164; Mon, 29 Aug 2022 13:13:02 -0700 (PDT) Date: Mon, 29 Aug 2022 20:12:49 +0000 In-Reply-To: <20220829201254.1814484-1-cmllamas@google.com> Mime-Version: 1.0 References: <20220829201254.1814484-1-cmllamas@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220829201254.1814484-3-cmllamas@google.com> Subject: [PATCH 2/7] binder: fix trivial kernel-doc typo From: Carlos Llamas To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Carlos Llamas , Suren Baghdasaryan Cc: kernel-team@android.com, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Correct the misspelling of 'invariant' in kernel-doc section. No functional changes in this patch. Signed-off-by: Carlos Llamas Acked-by: Todd Kjos Reviewed-by: Christian Brauner (Microsoft) --- drivers/android/binder_alloc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/android/binder_alloc.h b/drivers/android/binder_alloc.h index 1e4fd37af5e0..0c37935ff7a2 100644 --- a/drivers/android/binder_alloc.h +++ b/drivers/android/binder_alloc.h @@ -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 --=20 2.37.2.672.g94769d06f0-goog From nobody Tue Apr 7 09:05:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69504ECAAD2 for ; Mon, 29 Aug 2022 20:13:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230156AbiH2UNQ (ORCPT ); Mon, 29 Aug 2022 16:13:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230100AbiH2UNI (ORCPT ); Mon, 29 Aug 2022 16:13:08 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F2F998CAD for ; Mon, 29 Aug 2022 13:13:05 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id ng1-20020a17090b1a8100b001f4f9f69d48so10022434pjb.4 for ; Mon, 29 Aug 2022 13:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc; bh=WJzB5IQZP66mJjCwJYN9gnp3TBKYElg3Hb9FiTSQVnY=; b=X8tqqakOea9dhbov/1B9GOS6hSDPuMxtltqqzDxgWn5FGeLZ5xXt/dPvI0wdP/dGEl l+zZ44oceV8f7ofhC9obYHftXZsi7+CzOAtwVpaVl5wX631xX1G1Yj2rh879VJA3XYhq 9VxZq3KTX8pxdmh216u1FO5CX/UoWgtJxZ3VYQthmEiBf0OeaxSkPOKA0hJeENc2wUXZ 7wMtjvq7OOKwsh9pXRKeLP+AbTUXoyZ+qziwoaMryUujPIYRf2StQ/e+74ehj96OSftv wK+1idhVo4f0mnpL0DErADmsdMIsGSpiTabp4CXIph6hE2rKpz/UsUmpGDyHOduB0PPT hvIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc; bh=WJzB5IQZP66mJjCwJYN9gnp3TBKYElg3Hb9FiTSQVnY=; b=kONIBNiSNqCbWdlB0WtlGJH9htgSO4VWEvW532VK3QX/GpmVqFzNW5JfvA1p5pZiwc /JzT3DHAr/pDqbVKYvsJ4faEKZoVOtRSEMXCSrDSUxO2RmWyBtufyYR0Hp0tLDTn7p1d kxQiayomB6Vx/i88xBdayRc1czJgzIJUwcYlY2/pcHNAAwMA08Jp0srkfjj6lwbkLTIC LGBtQ0OxPpF9f6zn25Ah6tIbSEfy5HgD8yFBJ6TbyBhyIQf9Kn7Dh3uIGTl+kRseziWX WlHJLZ1gHBGcYYHwvYjlpXHJe3w6pgHCL81KaoCjJg5EeCz0WEEc3MOdKKDMrdeeIIvu FzWA== X-Gm-Message-State: ACgBeo257xy2gbW1TPHD3f2H0KtVCSrBn5rhXp9+Oa619W4gT32RrqQ/ iut+8gZejQ+ePdyobkeWUb985gjdSztgvg== X-Google-Smtp-Source: AA6agR6SGDKQ8bwk+SigGKhBcFPna6R0C8YjkOXAyEZV2w5qOCnh8KfY95Rj8U9X2pdBo0qmYnfiN6xc0oahSQ== X-Received: from xllamas.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5070]) (user=cmllamas job=sendgmr) by 2002:a17:90b:17d1:b0:1fd:f08d:f82b with SMTP id me17-20020a17090b17d100b001fdf08df82bmr3252849pjb.71.1661803984685; Mon, 29 Aug 2022 13:13:04 -0700 (PDT) Date: Mon, 29 Aug 2022 20:12:50 +0000 In-Reply-To: <20220829201254.1814484-1-cmllamas@google.com> Mime-Version: 1.0 References: <20220829201254.1814484-1-cmllamas@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220829201254.1814484-4-cmllamas@google.com> Subject: [PATCH 3/7] binder: rename alloc->vma_vm_mm to alloc->mm From: Carlos Llamas To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Carlos Llamas , Suren Baghdasaryan Cc: kernel-team@android.com, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename ->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. Signed-off-by: Carlos Llamas Acked-by: Todd Kjos Reviewed-by: Christian Brauner (Microsoft) --- drivers/android/binder_alloc.c | 34 +++++++++++++++++----------------- drivers/android/binder_alloc.h | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index 9b1778c00610..749a4cd30a83 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -208,8 +208,8 @@ static int binder_update_page_range(struct binder_alloc= *alloc, int allocate, } } =20 - if (need_mm && mmget_not_zero(alloc->vma_vm_mm)) - mm =3D alloc->vma_vm_mm; + if (need_mm && mmget_not_zero(alloc->mm)) + mm =3D alloc->mm; =20 if (mm) { mmap_read_lock(mm); @@ -322,9 +322,9 @@ static inline void binder_alloc_set_vma(struct binder_a= lloc *alloc, */ if (vma) { vm_start =3D 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); } =20 alloc->vma_addr =3D vm_start; @@ -336,7 +336,7 @@ static inline struct vm_area_struct *binder_alloc_get_v= ma( struct vm_area_struct *vma =3D NULL; =20 if (alloc->vma_addr) - vma =3D vma_lookup(alloc->vma_vm_mm, alloc->vma_addr); + vma =3D vma_lookup(alloc->mm, alloc->vma_addr); =20 return vma; } @@ -401,15 +401,15 @@ static struct binder_buffer *binder_alloc_new_buf_loc= ked( size_t size, data_offsets_size; int ret; =20 - 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); =20 data_offsets_size =3D ALIGN(data_size, sizeof(void *)) + ALIGN(offsets_size, sizeof(void *)); @@ -823,7 +823,7 @@ void binder_alloc_deferred_release(struct binder_alloc = *alloc) buffers =3D 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)); =20 while ((n =3D rb_first(&alloc->allocated_buffers))) { buffer =3D 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); =20 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. */ =20 - mmap_read_lock(alloc->vma_vm_mm); + mmap_read_lock(alloc->mm); if (binder_alloc_get_vma(alloc) =3D=3D NULL) { - mmap_read_unlock(alloc->vma_vm_mm); + mmap_read_unlock(alloc->mm); goto uninitialized; } =20 - mmap_read_unlock(alloc->vma_vm_mm); + mmap_read_unlock(alloc->mm); for (i =3D 0; i < alloc->buffer_size / PAGE_SIZE; i++) { page =3D &alloc->pages[i]; if (!page->page_ptr) @@ -1020,7 +1020,7 @@ enum lru_status binder_alloc_free_page(struct list_he= ad *item, index =3D page - alloc->pages; page_addr =3D (uintptr_t)alloc->buffer + index * PAGE_SIZE; =20 - mm =3D alloc->vma_vm_mm; + mm =3D alloc->mm; if (!mmget_not_zero(mm)) goto err_mmget; if (!mmap_read_trylock(mm)) @@ -1089,8 +1089,8 @@ static struct shrinker binder_shrinker =3D { void binder_alloc_init(struct binder_alloc *alloc) { alloc->pid =3D current->group_leader->pid; - alloc->vma_vm_mm =3D current->mm; - mmgrab(alloc->vma_vm_mm); + alloc->mm =3D current->mm; + mmgrab(alloc->mm); mutex_init(&alloc->mutex); INIT_LIST_HEAD(&alloc->buffers); } diff --git a/drivers/android/binder_alloc.h b/drivers/android/binder_alloc.h index 0c37935ff7a2..fe80cc405707 100644 --- a/drivers/android/binder_alloc.h +++ b/drivers/android/binder_alloc.h @@ -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; --=20 2.37.2.672.g94769d06f0-goog From nobody Tue Apr 7 09:05:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDEF4ECAAD2 for ; Mon, 29 Aug 2022 20:13:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230122AbiH2UNX (ORCPT ); Mon, 29 Aug 2022 16:13:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230114AbiH2UNL (ORCPT ); Mon, 29 Aug 2022 16:13:11 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3636B9A6A8 for ; Mon, 29 Aug 2022 13:13:08 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id g11-20020a17090a4b0b00b001fb5f1e195fso3795658pjh.6 for ; Mon, 29 Aug 2022 13:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc; bh=aDagGx3LmgoyG54CwPD56b1ruBMwrXgt45EyqcA5Eq4=; b=cZsOAAQHSrP7c9yogJRusVGdA0QfV2bAHT91gNt+0Ijqx8OJepa8sgaM+ONgUtH3e/ StdWYnFhQc8yqin6KxBUlGWlqtf29vrvcEfzu7wXboVDFDB26wiwTGdQdykJCZFWrgcu AhDZ4gBxcDDPxvh7ocrfenboYT58uNHQKRJnynlPemFgPOiF9wBPP28AL3NLDin+q27c vS9HV2VlERv3grfCGa5nJ2Olh92ZTCWfKLCs0mElHkV3ZVmIBVA3hYWX6HrCwJAO2Oo+ jLSIyauYFfFwtrdriGOHAuBvt2zN6JPHZDxRww/BojS7sd45CJDszez+mRXjH1jL5arp PxiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc; bh=aDagGx3LmgoyG54CwPD56b1ruBMwrXgt45EyqcA5Eq4=; b=cu1sAyAFG1j3gZlgp6RUKEDdgynIIzmgZuuAG8iJEMKUfmtVnlh7CqKC2vwrGBk5oG qfv/4K+ft2NBRMEhl1tmmfc1Q2MXI+9dCpX0rA6rpGMTCR25ypHzp6x4GTYC6iIp2Tnq UG6hPJg1DyIBTN93yRNuvr1EORb+hcPuzTwtaVCfhVvlu04OyCSFxPhj2c/uZgRpN3X1 BwprpXIKmCwEiLJ8qEiMMFH34YHgXlNJJ9wRHlq1Mgs6H4jbm1sKLepFjDg4nGI7jgaJ 8oBD7+c/vHDDjQYZKimUoE/hMpNKqnWJVKeS4w0Hhjq8yHJondOWdSMWZ8KLoIIISFfV eOQQ== X-Gm-Message-State: ACgBeo12c/qr1Seneq+0p9tH+/d/EfTEBmh4i3rUKY5Squ8I/HQFh/QA LBk6UwsyAUq0rICSxCjZ5Bl+MOrcndolLw== X-Google-Smtp-Source: AA6agR6bYY/0Ms9Rm2K4zTlKiliLNrKMEJWP57mEgt9uJpP9xCFzGry+154uC9ica0AD+Xk5Bg5dFMdO8a17lQ== X-Received: from xllamas.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5070]) (user=cmllamas job=sendgmr) by 2002:a17:90a:249:b0:1e0:a8a3:3c6c with SMTP id t9-20020a17090a024900b001e0a8a33c6cmr4718pje.0.1661803987114; Mon, 29 Aug 2022 13:13:07 -0700 (PDT) Date: Mon, 29 Aug 2022 20:12:51 +0000 In-Reply-To: <20220829201254.1814484-1-cmllamas@google.com> Mime-Version: 1.0 References: <20220829201254.1814484-1-cmllamas@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220829201254.1814484-5-cmllamas@google.com> Subject: [PATCH 4/7] binder: remove binder_alloc_set_vma() From: Carlos Llamas To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Carlos Llamas , Suren Baghdasaryan Cc: kernel-team@android.com, "Liam R . Howlett" , linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The 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. Cc: Liam R. Howlett Signed-off-by: Carlos Llamas --- drivers/android/binder_alloc.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index 749a4cd30a83..1c39cfce32fa 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -309,27 +309,6 @@ static int binder_update_page_range(struct binder_allo= c *alloc, int allocate, return vma ? -ENOMEM : -ESRCH; } =20 - -static inline void binder_alloc_set_vma(struct binder_alloc *alloc, - struct vm_area_struct *vma) -{ - unsigned long vm_start =3D 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 =3D vma->vm_start; - mmap_assert_write_locked(alloc->mm); - } else { - mmap_assert_locked(alloc->mm); - } - - alloc->vma_addr =3D 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 *allo= c, buffer->free =3D 1; binder_insert_free_buffer(alloc, buffer); alloc->free_async_space =3D alloc->buffer_size / 2; - binder_alloc_set_vma(alloc, vma); + alloc->vma_addr =3D vma->vm_start; =20 return 0; =20 @@ -983,7 +962,7 @@ int binder_alloc_get_allocated_count(struct binder_allo= c *alloc) */ void binder_alloc_vma_close(struct binder_alloc *alloc) { - binder_alloc_set_vma(alloc, NULL); + alloc->vma_addr =3D 0; } =20 /** --=20 2.37.2.672.g94769d06f0-goog From nobody Tue Apr 7 09:05:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 548D7ECAAD2 for ; Mon, 29 Aug 2022 20:13:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230164AbiH2UN1 (ORCPT ); Mon, 29 Aug 2022 16:13:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230133AbiH2UNL (ORCPT ); Mon, 29 Aug 2022 16:13:11 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D150E99B61 for ; Mon, 29 Aug 2022 13:13:09 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id d6-20020a170902cec600b00174be1616c4so2749131plg.22 for ; Mon, 29 Aug 2022 13:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc; bh=/VThv+tjo6zeyyM6s3mIRpPL525v6/rUnx75IOl8UcY=; b=HERL353EXOu8sHVQwfGHM75q3HiHjX73sJn0HMbUNrkYmj2F93JDA8WiNtmM1kG7fM XH1zc/fgd4uY0/kCMU8a6F9Dcg7gFXyA5B+un0mwF12lfEGtzkTvY+iziuNykVlAUymN 28fx2UFAzzwK+3Gxj7aV4sjOuz54wMrf4HoG+5bxCqfh6PX+8NI771U6yaxKlC58YBgy 0uqxZv48yPHXRn6M66g8s119yjOyR/7/TpH6FgpfuPxeGLUrJIz+z0nJcGvFnzQqGQ2c /EtW7tQJDXM4TnFlXXxWldBDXrH5RzQu6AO6DoXByezfWP8X/F6zWfkUQnpW/MrWZX1H L5AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc; bh=/VThv+tjo6zeyyM6s3mIRpPL525v6/rUnx75IOl8UcY=; b=DrKoU+QxBNGiXX6OoMXoRQL2BoiGRG2xeEPPD61E4LKR6tyb043ul40PPepiH4+C+6 APUUiMtnP5v11uw0SH3+tqLDGGKDSOtKSramlZRbIVvddaAU3A2APQfQo5MXkx1GMgg7 nWHVk7+zQ/1S1jP+MmpKnzL8jO/KQvDraXUsRHCdNDZ/W4rBVgOY8GAEycocvkQGw7UV XmuBu8eyAEARPOjO0oB0dZYUCQ3JInkSHXy3crSQRy9y/6TMCCNd6xsgEj+Q1s+h1K+R nB0/2PvTPZfR+OJ7ZSQJnW7SDNLGArJ2xxSGHZHLBfOyaPZEjqDeqh5jnkeP5F2QbF+u QKQg== X-Gm-Message-State: ACgBeo2X+K9ddnC8PHQVWn+xqW+iKGWna40UuEBQf4UBBjVcdu5NDda9 zVKtmgYpol2rfHXS1jcVkI7g/Z0rcyWqrw== X-Google-Smtp-Source: AA6agR44iriQeDXdgAvX4vNd3NFHaCNbdwc8OiLFAakZZBLGzj4mhYZxBtLwFzx6rmpF8+WHDrqydlcQOtARnQ== X-Received: from xllamas.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5070]) (user=cmllamas job=sendgmr) by 2002:a17:902:ea85:b0:174:3c3a:8ff3 with SMTP id x5-20020a170902ea8500b001743c3a8ff3mr16542934plb.152.1661803989292; Mon, 29 Aug 2022 13:13:09 -0700 (PDT) Date: Mon, 29 Aug 2022 20:12:52 +0000 In-Reply-To: <20220829201254.1814484-1-cmllamas@google.com> Mime-Version: 1.0 References: <20220829201254.1814484-1-cmllamas@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220829201254.1814484-6-cmllamas@google.com> Subject: [PATCH 5/7] binder: remove unused binder_alloc->buffer_free From: Carlos Llamas To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Carlos Llamas , Suren Baghdasaryan Cc: kernel-team@android.com, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Todd Kjos Reviewed-by: Christian Brauner (Microsoft) --- drivers/android/binder_alloc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/android/binder_alloc.h b/drivers/android/binder_alloc.h index fe80cc405707..ab3b027bcd29 100644 --- a/drivers/android/binder_alloc.h +++ b/drivers/android/binder_alloc.h @@ -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; --=20 2.37.2.672.g94769d06f0-goog From nobody Tue Apr 7 09:05:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C00DECAAD2 for ; Mon, 29 Aug 2022 20:13:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230233AbiH2UNf (ORCPT ); Mon, 29 Aug 2022 16:13:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230173AbiH2UNT (ORCPT ); Mon, 29 Aug 2022 16:13:19 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 845969A98B for ; Mon, 29 Aug 2022 13:13:12 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id k16-20020a635a50000000b0042986056df6so4470419pgm.2 for ; Mon, 29 Aug 2022 13:13:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc; bh=XHiRVH6PvcnEh6Bc/jOcBi/Pai5dajqR1Td589CcaX4=; b=b2rdg09HH56XEAzAC/mnFioEDHIK8e9YWkW4UtXLOwPhXtdR7Kz9/hfYREFa7bAKLO NoIoDIuvxdaRExyNpRawdqUKzvoCFy3Nrh1pTjSCM5WV2w8XHB9VYOyd+e2Tzk0+zMtZ UGYe8amFUD2IJu6oFITRCGHJz1VZ8Z5inkAmA8pYgpD9S65qaY2EkkjPqYm4VNtrZc3b 44LkpB/v4G7AvrehKVefyn2y9cmmJYsa0dO8AvrbyaGCAY8PMyROuU9Ibd4u4O3O8UtD nCyp0Fb4W29v+lMre3HibWk8p+2QubU+F9K74+/OB4/HEGwkJ6+PnaSsdhi0NO8brqLI 5Lxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc; bh=XHiRVH6PvcnEh6Bc/jOcBi/Pai5dajqR1Td589CcaX4=; b=rfSwJA3dVfVIgSX/C9s8z0Pbf+LTGGXpadg+4ioNA+4gG2wG4+RNPhmYScjX6nnwxl UvemhFq9nBHdN4Zp2/z9B9cL9VDNzesNkjBmZ3nIGJJyvf+KgqvJi4FkHF+zm+mXzoGP NMc/ujgPYJI5a2JUyURNWO9Oedn65Uk3DLoJjBhiS5U8NjoJnP188vlUOOp4K06pxAN4 zWjoP3Mf9xMsrJJmWYO9HlLbfmpjA7XyEFx+I5Gh0/6XWc3Fx2WqI96nuuTDIa2omwtS G6waGHdzWu2et2m7kOjaqvzVCYs1zsi+dNji8ehN6k43mQUNQc5E9sxbq63EY1UGdHTE z21g== X-Gm-Message-State: ACgBeo22XWrvqcJQvjLt2jxL+4tb7kEEurE05TSRwrWSyNXmJq2YGBrn E/pqmr3CF+fRm/cxIbrvdhudO4zO/5Gm0g== X-Google-Smtp-Source: AA6agR44COTEqaAcWNGnUJ4oOepGsgnQDx4nBKvNIKkPfzk0jx7N9GoRr1NmaEchICodaprh/rn3F775T1Z9Uw== X-Received: from xllamas.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5070]) (user=cmllamas job=sendgmr) by 2002:a05:6a00:810:b0:52e:7dc8:c868 with SMTP id m16-20020a056a00081000b0052e7dc8c868mr17903095pfk.36.1661803991361; Mon, 29 Aug 2022 13:13:11 -0700 (PDT) Date: Mon, 29 Aug 2022 20:12:53 +0000 In-Reply-To: <20220829201254.1814484-1-cmllamas@google.com> Mime-Version: 1.0 References: <20220829201254.1814484-1-cmllamas@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220829201254.1814484-7-cmllamas@google.com> Subject: [PATCH 6/7] binder: fix binder_alloc kernel-doc warnings From: Carlos Llamas To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Carlos Llamas , Suren Baghdasaryan Cc: kernel-team@android.com, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update 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_al= loc' warning: Function parameter or member 'vma_addr' not described in 'binder= _alloc' No functional changes in this patch. Signed-off-by: Carlos Llamas Acked-by: Todd Kjos Reviewed-by: Christian Brauner (Microsoft) --- drivers/android/binder_alloc.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/android/binder_alloc.h b/drivers/android/binder_alloc.h index ab3b027bcd29..0f811ac4bcff 100644 --- a/drivers/android/binder_alloc.h +++ b/drivers/android/binder_alloc.h @@ -74,10 +74,9 @@ struct binder_lru_page { =20 /** * 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 --=20 2.37.2.672.g94769d06f0-goog From nobody Tue Apr 7 09:05:36 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64614ECAAD8 for ; Mon, 29 Aug 2022 20:13:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230287AbiH2UNj (ORCPT ); Mon, 29 Aug 2022 16:13:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230187AbiH2UNW (ORCPT ); Mon, 29 Aug 2022 16:13:22 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 089269A9CE for ; Mon, 29 Aug 2022 13:13:13 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id m11-20020a17090a3f8b00b001fabfce6a26so3799056pjc.4 for ; Mon, 29 Aug 2022 13:13:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc; bh=VC8vXk4FOjSceP7/E2DfzH10PAfXYVNaW5zOB6Dmb1Q=; b=ACNc/cQFaJy4AIzG4EOsXsQjyWDSOETVFX10dAnkBsJDO9sqSKiuUrtVXSgryc+r2U Ij9Nlz+jswnlWZDNBQqmfRMU1qXFQz8R/NhBANXBySuZTKlph1PSwdL33hFPKKKPxtTE N3SVMmmlj+1GDH63YTUL5v3PuVK0t5O+tLYOH5DsgA9XMqR560OYp7Dn/4IzNkPDwd4D NiTqQGeAM3dsBANWNmtdn3lEfnJ5tCZvrdvYLTBQMWA6j95aUjWuVWGx+/IYnAOryI1Q mzcPHqC5hnKLXvnpQpEC2vOMEEOzKO5sHp9/qUjXi1wwFiYlQUxyew8+vFwLj5SN2ALL EISA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc; bh=VC8vXk4FOjSceP7/E2DfzH10PAfXYVNaW5zOB6Dmb1Q=; b=Uw15IW+ai42c4g3b/Oz6j7fwHc6mWh/ERxVFK8ZeOSGaU04Ord7AUTY0HVxHmWW/l+ gnWo/uRlh4O1V8nHlcUTojAfQRiNuqkGu0sEzewdtUZ7m6PKJKUIOGRyykZqa6wJKQz5 OWpT5X/o6Z+M7gUkHvI0zoRRJZ7Veo1zn2Quf41R/4DsEtm/MMTRNnhLPCnd2C2oICxA G0Op1b+DOcq10/84NtInb98fGvv8pImyrYHWwi0tlKp2lSseXqz9g8FwNPrlpIlm3QuT lMTP6djJbnACZ7w+k3L2P6nV0St9f6UyHO/18pEXav6fB2XIqx/338Tks+VtiFh7mX1P d1cQ== X-Gm-Message-State: ACgBeo3GUwcmOWYHOqAkoCY9JCpogBhb7O3KtTeU8xxNS+8vFQEQL43e kkBvL2fUncfzjuNmK6arMRx+u3m691yfPA== X-Google-Smtp-Source: AA6agR7kUGq2vaqwjKHpnxoGBX1COG6g7EI/1oAQFxNqod8E3/2FGVGbUizyBTBQ8yahJIGKykeLlofwlDbYKA== X-Received: from xllamas.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5070]) (user=cmllamas job=sendgmr) by 2002:a65:63c3:0:b0:42b:5b03:ce57 with SMTP id n3-20020a6563c3000000b0042b5b03ce57mr15158401pgv.436.1661803993083; Mon, 29 Aug 2022 13:13:13 -0700 (PDT) Date: Mon, 29 Aug 2022 20:12:54 +0000 In-Reply-To: <20220829201254.1814484-1-cmllamas@google.com> Mime-Version: 1.0 References: <20220829201254.1814484-1-cmllamas@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220829201254.1814484-8-cmllamas@google.com> Subject: [PATCH 7/7] binderfs: remove unused INTSTRLEN macro From: Carlos Llamas To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Carlos Llamas , Suren Baghdasaryan Cc: kernel-team@android.com, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix the following W=3D1 build error: drivers/android/binderfs.c:42: error: macro "INTSTRLEN" is not used [-Werro= r=3Dunused-macros] 42 | #define INTSTRLEN 21 | No functional changes in this patch. Signed-off-by: Carlos Llamas Reviewed-by: Christian Brauner (Microsoft) --- drivers/android/binderfs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/android/binderfs.c b/drivers/android/binderfs.c index 588d753a7a19..44939ea1874f 100644 --- a/drivers/android/binderfs.c +++ b/drivers/android/binderfs.c @@ -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) --=20 2.37.2.672.g94769d06f0-goog