From: Suren Baghdasaryan <surenb@google.com>
To: Liam Howlett <liam.howlett@oracle.com>
Cc: Matthew Wilcox <willy@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
"mhocko@kernel.org" <mhocko@kernel.org>,
"mhocko@suse.com" <mhocko@suse.com>,
"shy828301@gmail.com" <shy828301@gmail.com>,
"rientjes@google.com" <rientjes@google.com>,
"hannes@cmpxchg.org" <hannes@cmpxchg.org>,
"guro@fb.com" <guro@fb.com>,
"riel@surriel.com" <riel@surriel.com>,
"minchan@kernel.org" <minchan@kernel.org>,
"kirill@shutemov.name" <kirill@shutemov.name>,
"aarcange@redhat.com" <aarcange@redhat.com>,
"brauner@kernel.org" <brauner@kernel.org>,
"christian@brauner.io" <christian@brauner.io>,
"hch@infradead.org" <hch@infradead.org>,
"oleg@redhat.com" <oleg@redhat.com>,
"david@redhat.com" <david@redhat.com>,
"jannh@google.com" <jannh@google.com>,
"shakeelb@google.com" <shakeelb@google.com>,
"luto@kernel.org" <luto@kernel.org>,
"christian.brauner@ubuntu.com" <christian.brauner@ubuntu.com>,
"fweimer@redhat.com" <fweimer@redhat.com>,
"jengelh@inai.de" <jengelh@inai.de>,
"timmurray@google.com" <timmurray@google.com>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"kernel-team@android.com" <kernel-team@android.com>,
"syzbot+2ccf63a4bd07cf39cab0@syzkaller.appspotmail.com"
<syzbot+2ccf63a4bd07cf39cab0@syzkaller.appspotmail.com>
Subject: Re: [PATCH 1/1] mm: fix use-after-free bug when mm->mmap is reused after being freed
Date: Thu, 10 Mar 2022 08:28:33 -0800 [thread overview]
Message-ID: <CAJuCfpHk+1snrPx-_qvj=kjSOS+o=L90evAQ1gD5hj6XxB=a3g@mail.gmail.com> (raw)
In-Reply-To: <20220310155454.g6lt54yxel3ixnp3@revolver>
On Thu, Mar 10, 2022 at 7:55 AM Liam Howlett <liam.howlett@oracle.com> wrote:
>
> * Suren Baghdasaryan <surenb@google.com> [220225 00:51]:
> > On Thu, Feb 24, 2022 at 8:23 PM Matthew Wilcox <willy@infradead.org> wrote:
> > >
> > > On Thu, Feb 24, 2022 at 08:18:59PM -0800, Andrew Morton wrote:
> > > > On Tue, 15 Feb 2022 12:19:22 -0800 Suren Baghdasaryan <surenb@google.com> wrote:
> > > >
> > > > > After exit_mmap frees all vmas in the mm, mm->mmap needs to be reset,
> > > > > otherwise it points to a vma that was freed and when reused leads to
> > > > > a use-after-free bug.
> > > > >
> > > > > ...
> > > > >
> > > > > --- a/mm/mmap.c
> > > > > +++ b/mm/mmap.c
> > > > > @@ -3186,6 +3186,7 @@ void exit_mmap(struct mm_struct *mm)
> > > > > vma = remove_vma(vma);
> > > > > cond_resched();
> > > > > }
> > > > > + mm->mmap = NULL;
> > > > > mmap_write_unlock(mm);
> > > > > vm_unacct_memory(nr_accounted);
> > > > > }
> > > >
> > > > After the Maple tree patches, mm_struct.mmap doesn't exist. So I'll
> > > > revert this fix as part of merging the maple-tree parts of linux-next.
> > > > I'll be sending this fix to Linus this week.
> > > >
> > > > All of which means that the thusly-resolved Maple tree patches might
> > > > reintroduce this use-after-free bug.
> > >
> > > I don't think so? The problem is that VMAs are (currently) part of
> > > two data structures -- the rbtree and the linked list. remove_vma()
> > > only removes VMAs from the rbtree; it doesn't set mm->mmap to NULL.
> > >
> > > With maple tree, the linked list goes away. remove_vma() removes VMAs
> > > from the maple tree. So anyone looking to iterate over all VMAs has to
> > > go and look in the maple tree for them ... and there's nothing there.
> >
> > Yes, I think you are right. With maple trees we don't need this fix.
>
>
> Yes, this is correct. The maple tree removes the entire linked list...
> but since the mm is unstable in the exit_mmap(), I had added the
> destruction of the maple tree there. Maybe this is the wrong place to
> be destroying the tree tracking the VMAs (althought this patch partially
> destroys the VMA tracking linked list), but it brought my attention to
> the race that this patch solves and the process_mrelease() function.
> Couldn't this be avoided by using mmget_not_zero() instead of mmgrab()
> in process_mrelease()?
That's what we were doing before [1]. That unfortunately has a problem
of process_mrelease possibly calling the last mmput and being blocked
on IO completion in exit_aio. The race between exit_mmap and
process_mrelease is solved by using mmap_lock.
I think by destroying the maple tree in exit_mmap before the
mmap_write_unlock call, you keep things working and functionality
intact. Is there any reason this can't be done?
[1] ba535c1caf3ee78a ("mm/oom_kill: allow process_mrelease to run
under mmap_lock protection")
> That would ensure we aren't stepping on an
> exit_mmap() and potentially the locking change in exit_mmap() wouldn't
> be needed either? Logically, I view this as process_mrelease() having
> issue with the fact that the mmaps are no longer stable in tear down
> regardless of the data structure that is used.
>
> Thanks,
> Liam
>
> --
> To unsubscribe from this group and stop receiving emails from it, send an email to kernel-team+unsubscribe@android.com.
>
next prev parent reply other threads:[~2022-03-10 16:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 20:19 Suren Baghdasaryan
2022-02-15 20:26 ` Rik van Riel
2022-02-15 20:37 ` Andrew Morton
2022-02-15 20:45 ` Suren Baghdasaryan
2022-02-15 20:46 ` Suren Baghdasaryan
2022-02-15 20:51 ` Andrew Morton
2022-02-15 20:42 ` Yang Shi
2022-02-16 7:54 ` Michal Hocko
2022-02-17 19:51 ` Suren Baghdasaryan
2022-02-17 20:50 ` Andrew Morton
2022-02-18 8:11 ` Michal Hocko
2022-02-18 8:10 ` Michal Hocko
2022-02-25 4:18 ` Andrew Morton
2022-02-25 4:23 ` Matthew Wilcox
2022-02-25 5:50 ` Suren Baghdasaryan
2022-03-10 15:55 ` Liam Howlett
2022-03-10 16:28 ` Suren Baghdasaryan [this message]
2022-03-10 22:22 ` Liam Howlett
2022-03-10 23:31 ` Suren Baghdasaryan
2022-03-11 1:34 ` Liam Howlett
2022-02-25 10:17 ` Michal Hocko
2022-02-26 1:04 ` Andrew Morton
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='CAJuCfpHk+1snrPx-_qvj=kjSOS+o=L90evAQ1gD5hj6XxB=a3g@mail.gmail.com' \
--to=surenb@google.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=christian.brauner@ubuntu.com \
--cc=christian@brauner.io \
--cc=david@redhat.com \
--cc=fweimer@redhat.com \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=hch@infradead.org \
--cc=jannh@google.com \
--cc=jengelh@inai.de \
--cc=kernel-team@android.com \
--cc=kirill@shutemov.name \
--cc=liam.howlett@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mhocko@kernel.org \
--cc=mhocko@suse.com \
--cc=minchan@kernel.org \
--cc=oleg@redhat.com \
--cc=riel@surriel.com \
--cc=rientjes@google.com \
--cc=shakeelb@google.com \
--cc=shy828301@gmail.com \
--cc=syzbot+2ccf63a4bd07cf39cab0@syzkaller.appspotmail.com \
--cc=timmurray@google.com \
--cc=willy@infradead.org \
/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