From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1B87C19F2D for ; Tue, 9 Aug 2022 18:49:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F5558E0003; Tue, 9 Aug 2022 14:49:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3A5438E0001; Tue, 9 Aug 2022 14:49:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 245F98E0003; Tue, 9 Aug 2022 14:49:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 15C3A8E0001 for ; Tue, 9 Aug 2022 14:49:14 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EE3E8410B4 for ; Tue, 9 Aug 2022 18:49:13 +0000 (UTC) X-FDA: 79780941786.15.75D67D6 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf31.hostedemail.com (Postfix) with ESMTP id 43D3C2015E for ; Tue, 9 Aug 2022 18:49:13 +0000 (UTC) Received: by mail-pj1-f45.google.com with SMTP id h21-20020a17090aa89500b001f31a61b91dso18502988pjq.4 for ; Tue, 09 Aug 2022 11:49:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc; bh=wxjpe2mRFKGT8P+j55tH9VVKtl0m60jJkcmkH27O1X0=; b=rX510oQLQTQgYsGfs52YJ2Pqzej/cCIfJYbCr+UQ7zuyxHrUImZc/1D2IXbhA+aWx4 9ge6y085uD4FX3x7eFej+7Wfiu/9UE6M8cKl1AZ7b1woItJw1DTyOfb17t1gAJCHJWiX XBUd1WphWCmHL+RKY/E7NPEwAW7cTRIzLyIAN7OhCa/v5kjBMeOvUr8AERC1w0NLbbPr FBeq+0hDfjgwUYmbeQON/xFV+3wDb8QB1Ud5hLy4MAoHhYLZ1JR+FEGRn9rtQ7FsJdeU hk5WVgwL1ms9QyE9I48mldDcHNg4cYxgyDbihYQqBTxsXBLM/vkb0CTXBPBi2lEQb5Ga lfdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc; bh=wxjpe2mRFKGT8P+j55tH9VVKtl0m60jJkcmkH27O1X0=; b=pljtOWt44SY+1sQuFJgk82dgFfL8xu9qFM1QP1BNnIOxL0sw+wfFqVT8EGL0ZVimAM 28Wa4BDmVD0knCDnvnlOue5ZSyRV2laQltl0ca1lIbF/Iw3jiJHiYHzOyP7T9ZydWnQ0 Nizzuo5reeS5Nnb2knOcDV5hpzx/yKtC8m2izv6SecGuKH1IomYsWahzk7CB03wbyEMy OIIGuf0Kd7QEyBO+m2RhCfHNktRSw7/8LQnooTIkFWQ7MITXJPVucUzWtAuFGtetcrQS svzCnxjaFb8WAW+/G2qnf2kvfXVsWd8FvF36qq0RrV3BPrmZ4yy1wJ+FGgpAy3r+uiRO o2rQ== X-Gm-Message-State: ACgBeo1GomJwyvNTcvuO/u3fRl/jPQ4Xp/9t0Lifw8n6cGObCn7OuDoa oOk8bFEAhGdx8qmzKjsHRSC5DQ== X-Google-Smtp-Source: AA6agR7V/N6oONYQ68gqg6oMgkl+qhMG1P6S21y/lICvQ32LYHpb4CDM+tIsSE+rHs9qxpl3WUxl2A== X-Received: by 2002:a17:90a:7aca:b0:1f1:ff59:fe7e with SMTP id b10-20020a17090a7aca00b001f1ff59fe7emr27772289pjl.11.1660070951915; Tue, 09 Aug 2022 11:49:11 -0700 (PDT) Received: from google.com (238.76.127.34.bc.googleusercontent.com. [34.127.76.238]) by smtp.gmail.com with ESMTPSA id l9-20020a170903120900b0016bfbd99f64sm11331143plh.118.2022.08.09.11.49.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 11:49:11 -0700 (PDT) Date: Tue, 9 Aug 2022 18:49:07 +0000 From: Carlos Llamas To: Liam Howlett Cc: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , syzbot , Andrew Morton , Ondrej Mosnacek , "syzkaller-bugs@googlegroups.com" , Minchan Kim , Christian Brauner , Greg Kroah-Hartman , Hridya Valsaraju , Joel Fernandes , Martijn Coenen , Suren Baghdasaryan , Todd Kjos , Matthew Wilcox , Arve =?iso-8859-1?B?SGr4bm5lduVn?= Subject: Re: [PATCH] binder_alloc: Add missing mmap_lock calls when using the VMA Message-ID: References: <20220809160618.1052539-1-Liam.Howlett@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220809160618.1052539-1-Liam.Howlett@oracle.com> ARC-Authentication-Results: i=1; imf31.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=rX510oQL; spf=pass (imf31.hostedemail.com: domain of cmllamas@google.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=cmllamas@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660070953; a=rsa-sha256; cv=none; b=DdrTR9PgLXXPwQCwpSL8nsnhtyLQ8WT0vHqdxJ5H1SYj/egOvQXNEc0DPmt9pgfgb5gNXl mhpRiHaUpTX1U8jSTn2hXN+ndyjfjn4NKBaYD7m0g1i/D9OSmgOlyX+z9HAdwbOn4qABoF VZioBHj349cORRl1/An0HWz4KhfxTes= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660070953; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wxjpe2mRFKGT8P+j55tH9VVKtl0m60jJkcmkH27O1X0=; b=O56yT2OzwUpDuUcdtI9MTy3D05Fk1WAQ85KpAnv/8G5jclwg+YZ6I6YB52caOLRxOPYPIU IyPi8974/zE4o9VIsOrvJqoobFynQswCDT3HWZ7DdiuEoU3mc4z9UFjxvjbhU3Ks+iWKAO CpyL63cayu+h2orEKa3PrRPRQNTJChQ= X-Stat-Signature: a6how5bogmcm79an4i6onfxn7cx7ofkd X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 43D3C2015E Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=rX510oQL; spf=pass (imf31.hostedemail.com: domain of cmllamas@google.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=cmllamas@google.com; dmarc=pass (policy=reject) header.from=google.com X-HE-Tag: 1660070953-366351 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Tue, Aug 09, 2022 at 04:06:31PM +0000, Liam Howlett wrote: > Take the mmap_read_lock() when using the VMA in > binder_alloc_print_pages() and when checking for a VMA in > binder_alloc_new_buf_locked(). > > It is worth noting binder_alloc_new_buf_locked() drops the VMA read lock > after it verifies a VMA exists, but may be taken again deeper in the > call stack, if necessary. > > Reported-by: Ondrej Mosnacek > Reported-by: syzbot+a7b60a176ec13cafb793@syzkaller.appspotmail.com > Fixes: a43cfc87caaf (android: binder: stop saving a pointer to the VMA) > Signed-off-by: Liam R. Howlett > --- > drivers/android/binder_alloc.c | 29 +++++++++++++++++++---------- > 1 file changed, 19 insertions(+), 10 deletions(-) > > diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c > index f555eebceef6..c23cad7fe313 100644 > --- a/drivers/android/binder_alloc.c > +++ b/drivers/android/binder_alloc.c > @@ -395,12 +395,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); > if (!binder_alloc_get_vma(alloc)) { > + mmap_read_unlock(alloc->vma_vm_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); > > data_offsets_size = ALIGN(data_size, sizeof(void *)) + > ALIGN(offsets_size, sizeof(void *)); > @@ -922,17 +925,23 @@ void binder_alloc_print_pages(struct seq_file *m, > * Make sure the binder_alloc is fully initialized, otherwise we might > * read inconsistent state. > */ > - if (binder_alloc_get_vma(alloc) != NULL) { > - for (i = 0; i < alloc->buffer_size / PAGE_SIZE; i++) { > - page = &alloc->pages[i]; > - if (!page->page_ptr) > - free++; > - else if (list_empty(&page->lru)) > - active++; > - else > - lru++; > - } > + > + mmap_read_lock(alloc->vma_vm_mm); > + if (binder_alloc_get_vma(alloc) == NULL) > + goto uninitialized; > + > + for (i = 0; i < alloc->buffer_size / PAGE_SIZE; i++) { do we need to hold on to the lock while we loop through the pages here? > + page = &alloc->pages[i]; > + if (!page->page_ptr) > + free++; > + else if (list_empty(&page->lru)) > + active++; > + else > + lru++; > } > + > +uninitialized: > + mmap_read_unlock(alloc->vma_vm_mm); > mutex_unlock(&alloc->mutex); > seq_printf(m, " pages: %d:%d:%d\n", active, lru, free); > seq_printf(m, " pages high watermark: %zu\n", alloc->pages_high); > -- > 2.35.1