From: Hillf Danton <hdanton@sina.com>
To: linmiaohe <linmiaohe@huawei.com>
Cc: Hillf Danton <hdanton@sina.com>,
"akpm@linux-foundation.org" <akpm@linux-foundation.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"syzkaller-bugs@googlegroups.com"
<syzkaller-bugs@googlegroups.com>,
syzbot <syzbot+c5d5a51dcbb558ca0cb5@syzkaller.appspotmail.com>
Subject: Re: general protection fault in unlink_file_vma
Date: Sun, 13 Sep 2020 19:16:16 +0800 [thread overview]
Message-ID: <20200913111616.3700-1-hdanton@sina.com> (raw)
In-Reply-To: <b79fec71e858499cbd420914da12fcdf@huawei.com>
On Sun, 13 Sep 2020 09:17:26 +0000 linmiaohe wrote:
>
> I reviewed the code carefully these days and I found vma_merge() do only fput() the vm_file of the linked vma in remove_next cases.
> This gpf is much likely because the ->mmap() callback can change vma->vm_file and fput the original file. But my previous commit
> failed to catch this case and always fput() the original file, hence add an extra fput().
> The below patch would make the things right:
>
> diff --git a/mm/mmap.c b/mm/mmap.c
> index 080f44bcf7a8..80ea11bf12fa 100644
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -1816,7 +1816,11 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
> merge = vma_merge(mm, prev, vma->vm_start, vma->vm_end, vma->vm_flags,
> NULL, vma->vm_file, vma->vm_pgoff, NULL, NULL_VM_UFFD_CTX);
> if (merge) {
> - fput(file);
> + /* ->mmap() can change vma->vm_file and fput the original file. So
> + * fput the vma->vm_file here or we would add an extra fput for file
> + * and cause general protection fault ultimately.
> + */
> + fput(vma->vm_file);
> vm_area_free(vma);
> vma = merge;
> /* Update vm_flags and possible addr to pick up the change. We don't
>
> It's very nice of you if you could help test this patch as I can't reproduce it in my product environment. And many thanks
> for a possible Tested-by tag.
Take another look at the Cc list and the link below.
https://lore.kernel.org/lkml/20200911120222.GT87483@ziepe.ca/
next prev parent reply other threads:[~2020-09-13 11:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-13 9:17 linmiaohe
2020-09-13 11:16 ` Hillf Danton [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-16 9:05 linmiaohe
2020-09-16 6:50 linmiaohe
2020-09-16 8:39 ` syzbot
2020-09-16 1:48 linmiaohe
2020-09-16 4:24 ` syzbot
2020-09-15 11:13 linmiaohe
2020-09-14 6:42 linmiaohe
2020-09-14 1:51 linmiaohe
2020-09-10 6:26 linmiaohe
2020-09-09 0:19 syzbot
2020-09-09 4:15 ` Hillf Danton
2020-09-10 2:13 ` Souptick Joarder
2020-09-10 4:17 ` Hillf Danton
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=20200913111616.3700-1-hdanton@sina.com \
--to=hdanton@sina.com \
--cc=akpm@linux-foundation.org \
--cc=linmiaohe@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=syzbot+c5d5a51dcbb558ca0cb5@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.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